From nobody Mon Oct 6 18:56:47 2025 Received: from e3i105.smtp2go.com (e3i105.smtp2go.com [158.120.84.105]) (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 4EAC72FA65A for ; Thu, 17 Jul 2025 15:55:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=158.120.84.105 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752767761; cv=none; b=ufKT7D45ynqeWgJt+kh30rNUMgAM/eZG1ycBwDKazV2J9s0CmhEcml7NoNJHXwspmhBDD8AFt5Hp2wth79YZeCvT+GysJ93mNRq2RwbrQGyt7gHaCWdlbT2gQWQgZMFk3HGKL02eiO8Lw02ajgBT0SHDX+Cp5JiXcNMfSCL3CmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752767761; c=relaxed/simple; bh=nB3WuwalJ9U/+bfO3AqJtL5A16Qj0C4J1YopVLVq6dU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BssloBuqBmZ7I11pIZlmQZH0xiAjLYu28OZr2GY0lhQmUjeBKTq+H4qruMEPAqvAESwUfzSckDQ7fBv8rptqoj+WBTN3kmwQqo0gN43nV6ZHPT5XT44C0jARy48nkmpwEmZDexjV4uO+Yeb1BvPsznK6rnvtVSMFnOG5n/gq+0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=triplefau.lt; spf=pass smtp.mailfrom=em510616.triplefau.lt; dkim=pass (2048-bit key) header.d=smtpservice.net header.i=@smtpservice.net header.b=oginOUih; dkim=pass (2048-bit key) header.d=triplefau.lt header.i=@triplefau.lt header.b=Rzg2h8G9; arc=none smtp.client-ip=158.120.84.105 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=triplefau.lt Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=em510616.triplefau.lt Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=smtpservice.net header.i=@smtpservice.net header.b="oginOUih"; dkim=pass (2048-bit key) header.d=triplefau.lt header.i=@triplefau.lt header.b="Rzg2h8G9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smtpservice.net; i=@smtpservice.net; q=dns/txt; s=a1-4; t=1752767755; h=feedback-id : x-smtpcorp-track : date : message-id : to : subject : from : reply-to : sender : list-unsubscribe : list-unsubscribe-post; bh=9ZDHBHMgGYp8rnsczho/Xwe4hAvNHcAACUmeGw53gPw=; b=oginOUihhX69ypXyTLUdWqgkdF5JxFQeoExRdj2YnZLcbx0LgBSXNLLV56KsMxLxT2jHw jsnK8t8pk2O4TbBl3bpnAnGUygVGeRjg0aFZ1ObfK1CLjC4nMqRN3h9sVSkjXvYwKqzX7sP 5fo4/RLrVNaifu3XuNyXHzEX3JJYksQo8ICOBiP9ob4GgOgugKZY01LXOmQGh6xGEjEW8S6 CfKf7zm+paPumeVTrTbXJ2TTWegIMyEHMfYCW9OBlU7eggYHVFvHi3f7zY7gprrwEVj9/gW XKpp7ZGpWTwecOdOzx/O5ea3ahLe7eINcf6AEMP1SMyzdGRFdgCp3edYbZjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triplefau.lt; i=@triplefau.lt; q=dns/txt; s=s510616; t=1752767755; h=from : subject : to : message-id : date; bh=9ZDHBHMgGYp8rnsczho/Xwe4hAvNHcAACUmeGw53gPw=; b=Rzg2h8G93j75r3krFvj5ciJhtQ1u8U7Gc8NsqsChaV0UPhRW7ZWlJRQ5GTbQOd2kX77Pr A2KG9eYMdY6mweI9VpXJ4tWRt4HwLgZ9/q+p0sN1KTKiF+c7L/POAeBHUum/a13pOfOjtr+ lkIBmiZL152wVATEQeALWkSiYOI3xBUzPjaWpE4OHL77HT0Ee/BGHnkbgan5LmKTjNMxjsK vU2Nt4mhnBoYXwgIExkmPtDPGerLJ+Qdoo+OsNJcipke1LUmy7lh4zTqL+pcS6K1LSPc2Gl eokm1R6liwdF0jDNqntTOCd+aGb0ikTfgNutPd4os/xG9vQVjdDfmJArUNrg== Received: from [10.12.239.196] (helo=localhost) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.98.1-S2G) (envelope-from ) id 1ucQxZ-FnQW0hPwcJx-nuXC; Thu, 17 Jul 2025 15:55:49 +0000 From: Remi Pommarel To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Johannes Berg , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Remi Pommarel , Bert Karwatzki Subject: [PATCH wireless 1/2] wifi: mac80211: Check 802.11 encaps offloading in ieee80211_tx_h_select_key() Date: Thu, 17 Jul 2025 17:45:28 +0200 Message-ID: <1af4b5b903a5fca5ebe67333d5854f93b2be5abe.1752765971.git.repk@triplefau.lt> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: 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-Report-Abuse: Please forward a copy of this message, including all headers, to Feedback-ID: 510616m:510616apGKSTK:510616sYIRlMKefe X-smtpcorp-track: 3giNsy77KLpy.T5nKk5GR7r8K.ZimjfwN1lOd Content-Type: text/plain; charset="utf-8" With 802.11 encapsulation offloading, ieee80211_tx_h_select_key() is called on 802.3 frames. In that case do not try to use skb data as valid 802.11 headers. Reported-by: Bert Karwatzki Closes: https://lore.kernel.org/linux-wireless/20250410215527.3001-1-spassw= olf@web.de Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after= TXQ dequeue") Signed-off-by: Remi Pommarel --- net/mac80211/tx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d58b80813bdd..0af5bf9aba6a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -612,6 +612,12 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) else tx->key =3D NULL; =20 + if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { + if (tx->key && tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) + info->control.hw_key =3D &tx->key->conf; + return TX_CONTINUE; + } + if (tx->key) { bool skip_hw =3D false; =20 --=20 2.50.1 From nobody Mon Oct 6 18:56:47 2025 Received: from e3i105.smtp2go.com (e3i105.smtp2go.com [158.120.84.105]) (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 7EBDD2FE39B for ; Thu, 17 Jul 2025 15:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=158.120.84.105 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752767766; cv=none; b=mNUbN8Zq9m/ubz+J+9NFFYnNAIyNkeLfs5hyiOiN/MA2VBiZGJlt3t1QYTXVBNXErc9xdBLsyRM0mIXX9znjac6EMlQ9dwNfpiwFWnYd9BBR+IQgQdtLFUo801D02ogAFgsN+R2KmaVSDb0WpipuuJ5KK6xznLRcs2Qr0SD9G+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752767766; c=relaxed/simple; bh=2WMfvBNE2F2EmCmzIXntmRnTPlV59NtALx1Yw4oHVMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m4rh/SQiUwr5YWo2CCwBMFgWi91eMxQYjzmaykYQC8ZA6e55Dcflk+uYoQTbHIIawTUUs1FLrpSyIW6MnZ0xUSahl3c6MCsw/18zzuxaYXXQWFHHhuN8E66hahOykjTdIEIZ7l5nvXoDi7YzC4wxdQjJ99FrMIlYFC0BqnhlqoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=triplefau.lt; spf=pass smtp.mailfrom=em510616.triplefau.lt; dkim=pass (2048-bit key) header.d=smtpservice.net header.i=@smtpservice.net header.b=IYoii2jU; dkim=pass (2048-bit key) header.d=triplefau.lt header.i=@triplefau.lt header.b=RuQIQteK; arc=none smtp.client-ip=158.120.84.105 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=triplefau.lt Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=em510616.triplefau.lt Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=smtpservice.net header.i=@smtpservice.net header.b="IYoii2jU"; dkim=pass (2048-bit key) header.d=triplefau.lt header.i=@triplefau.lt header.b="RuQIQteK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smtpservice.net; i=@smtpservice.net; q=dns/txt; s=a1-4; t=1752767755; h=feedback-id : x-smtpcorp-track : date : message-id : to : subject : from : reply-to : sender : list-unsubscribe : list-unsubscribe-post; bh=l8lNZs8wsHBELGPqY5Il4azRpO25P6AXof6ovV0cSeY=; b=IYoii2jUvkWvYZoc8R6xJrbTacS6C5wg117RiowMsNPks7g3KIG0HbtjA/pIZV4Clkmk0 gh1bxjOaoKX06QFPpGpZRLA5ATpQJaNCEmJoZ5wyUxP/CRuWuqZ7LVEIkCRXBi8AavJ2/ly tDM67M+PEPkMWmeGnZrQ3OfqyV1c0+ruNBPMwvkP3HN0j/rcrymmsBvyuZnVNJJ13w9XHr7 3KEnHioDQmam8KWjbcLmtG+/sMFMBJ9slO87KG8AM9A/ZhWUw56yzsZl6l9rpuIYhe4s/Yr ylf4XMgoXieWIwgtIcRdkGbWyTaWP5ry8PvguwhYbkrXCEazbbgOgdaRxbPQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triplefau.lt; i=@triplefau.lt; q=dns/txt; s=s510616; t=1752767755; h=from : subject : to : message-id : date; bh=l8lNZs8wsHBELGPqY5Il4azRpO25P6AXof6ovV0cSeY=; b=RuQIQteKnhdyVza+N1CuEHI3w4uh7stOCvosQXAw1Y3+ZHu4uEUJXiNKcdW426T0grfJk jf2ynl6da4wIBnCasJ9gKhiHjXM0ZDPT4PkGpu/wQUwdG0+XM8QTEkg6IbFYS/KI5Sni9JN UOMolhhXPu825SoK+kLpg3Fjg1A3PATnM3F6ydoIt2pAjV4aIdNo+BTxWgvC+uwcucVcszU j07oLrzdTgxUYQS1HKHH1cVYuQC/ITp06ZTo0PTKPVC+19jXauc+GreyrltEYFpnWeSWyLr SgesYgYfVGl48VQrB5Rlh8AFpD65bMcWeEVqXOq7nRPL+diTflkOcCmzmgsw== Received: from [10.12.239.196] (helo=localhost) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.98.1-S2G) (envelope-from ) id 1ucQxa-4o5NDgrfb1E-lJpi; Thu, 17 Jul 2025 15:55:50 +0000 From: Remi Pommarel To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Johannes Berg , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Remi Pommarel Subject: [PATCH wireless 2/2] Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" Date: Thu, 17 Jul 2025 17:45:29 +0200 Message-ID: <66b8fc39fb0194fa06c9ca7eeb6ffe0118dcb3ec.1752765971.git.repk@triplefau.lt> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: 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-Report-Abuse: Please forward a copy of this message, including all headers, to Feedback-ID: 510616m:510616apGKSTK:510616sZs8vCkADn X-smtpcorp-track: nSPOFT87ieDx.JCkvPuioJzft.XaBgKAIAiU_ Content-Type: text/plain; charset="utf-8" This reverts commit 0937cb5f345c79d702b4d0d744e2a2529b551cb2. This commit broke TX with 802.11 encapsulation HW offloading, now that this is fixed, reapply it. Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after= TXQ dequeue") Signed-off-by: Remi Pommarel --- net/mac80211/tx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 0af5bf9aba6a..fdc994d8c9c3 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3882,6 +3882,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211= _hw *hw, * The key can be removed while the packet was queued, so need to call * this here to get the current key. */ + info->control.hw_key =3D NULL; r =3D ieee80211_tx_h_select_key(&tx); if (r !=3D TX_CONTINUE) { ieee80211_free_txskb(&local->hw, skb); --=20 2.50.1