From nobody Fri Jul 24 23:30:38 2026 Received: from smtp14.infineon.com (smtp14.infineon.com [217.10.52.160]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B202C473C6F; Wed, 22 Jul 2026 08:28:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.10.52.160 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784708913; cv=none; b=czn/6MXojt5X0m2nyWbf5VvUl3avpZRZZeXATw9huATNjMehqUK/L59TcpB4vEZ05ec3dJUIUmFNKXeL2U7UG42/LyJo7DFLpw3HiHpzRieKipUlLOQqCY2fV9ZA1Fxkv29C778t63qkLSldjsStv+bS4up9PpmY+FZrNnqBMyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784708913; c=relaxed/simple; bh=EixoOQ7z6M70FC6xow3sUPIAwW+cfs5a/52T3oyotk4=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=suhtUfQCaKEhTMHysEL5GMXPckqEbjIiXgvQ0TklGvzOiFWeaSSOkZD3y/8RyHPd8wp7U6Eh5IMrobAkUizPqsjioj4mFWq0RQR7ykzEYcRlRJ95cbIJ59+64EKA9nyp/XyIrFP+hfZd7niAnFpuk3gGt4MfqvbQyShW5Nz7rHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=infineon.com; spf=pass smtp.mailfrom=infineon.com; dkim=pass (1024-bit key) header.d=infineon.com header.i=@infineon.com header.b=ozTIYxe+; arc=none smtp.client-ip=217.10.52.160 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=infineon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=infineon.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=infineon.com header.i=@infineon.com header.b="ozTIYxe+" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1784708910; x=1816244910; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EixoOQ7z6M70FC6xow3sUPIAwW+cfs5a/52T3oyotk4=; b=ozTIYxe+VcJcVGjEwui9i2Dmg16h8IyhLsd39lwgeEDde3b+Z9C6KZ9n pbiGBtwUJtomPUzI99BADH1PwBXk2HHedbgmluHzxNGJkKCqKbj9XkBYl qcLzWC2RTh4z+vH9Y17sQucyofniytzBuHxLdfLs4MVCVi+N/r98QNCKG U=; X-CSE-ConnectionGUID: +Fjbd8AoQAK97Dyf0VrqgA== X-CSE-MsgGUID: IGo3ju6GSlezfUvYRr7D/A== X-IronPort-AV: E=McAfee;i="6800,10657,11853"; a="138945297" X-IronPort-AV: E=Sophos;i="6.25,178,1779141600"; d="scan'208";a="138945297" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO MUCSE819.infineon.com) ([172.23.29.45]) by smtp14.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2026 10:27:14 +0200 Received: from MUCSE809.infineon.com (172.23.29.35) by MUCSE819.infineon.com (172.23.29.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Wed, 22 Jul 2026 10:27:13 +0200 Received: from ISCN5CG5251XQT.infineon.com (10.161.6.196) by MUCSE809.infineon.com (172.23.29.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Wed, 22 Jul 2026 10:27:11 +0200 From: Jason Huang To: CC: , , , Jason Huang Subject: [PATCH] wifi: brcmfmac: fix P2P action frame handling without device vif Date: Wed, 22 Jul 2026 16:26:08 +0800 Message-ID: <20260722082608.412472-1-Jason.Huang2@infineon.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MUCSE815.infineon.com (172.23.29.41) To MUCSE809.infineon.com (172.23.29.35) Content-Type: text/plain; charset="utf-8" From: Jason Huang Some P2P action frame paths assume the P2P device vif is always available. That is not true when userspace sends non-P2P public action frames through the primary interface, or when action-frame abort runs after the P2P device vif has not been created. Fall back to the primary vif when aborting an action frame without a P2P device vif, and guard P2P device saved IE access before using it for peer channel search. Fixes: 30fb1b272909 ("brcmfmac: use actframe_abort to cancel ongoing action= frame") Fixes: 6eda4e2c5425 ("brcmfmac: Add tx p2p off-channel support.") Signed-off-by: Jason Huang --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drive= rs/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index 92c16a317328..66557be28e7b 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -1283,6 +1283,9 @@ static s32 brcmf_p2p_abort_action_frame(struct brcmf_= cfg80211_info *cfg) brcmf_dbg(TRACE, "Enter\n"); =20 vif =3D p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif; + if (!vif) + vif =3D p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif; + err =3D brcmf_fil_bsscfg_data_set(vif->ifp, "actframe_abort", &int_val, sizeof(s32)); if (err) @@ -1819,6 +1822,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_if *ifp, /* validate channel and p2p ies */ if (config_af_params.search_channel && IS_P2P_SOCIAL_CHANNEL(le32_to_cpu(af_params->channel)) && + p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif && p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif->saved_ie.probe_req_ie_len) { afx_hdl =3D &p2p->afx_hdl; afx_hdl->peer_listen_chan =3D le32_to_cpu(af_params->channel); --=20 2.25.1