From nobody Wed Jun 11 09:14:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bHKjq55QVz600G6; Wed, 11 Jun 2025 09:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjp64cCz3mBL; Wed, 11 Jun 2025 09:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zHCUWWnuzAjfNYYVJuqBfpAhsDTKeAWvC2ofJuSXOZM=; b=NEo008h5ejdfq5edHqr/HyTSVokM7M9KuU33846tUxYa76q7gdDyN+DNfhLykUunVWgUdf CwdYGQ1TmLXw0QdAbT9AxiVhrNUzjBt03v0XPjICSdRC2wWF//oE3eEXDKI6xcgkv5puU2 GT3gv+FVh8z384HT9/D0WZhSQN/P0ggW5fGJg63DWLHhA/2urS4SNcaS3ebI8J/sN3XgCL Cu9vEmU25l0RgaYMjR+Y3M2OsWLKEhFmT9DyrKYTfiHbh1q4Dw9nIsDBpBycShAmjE0dvo aThKrI0Lw/4vfK0GmIjoJM+oNx48pBNttXjngKDCm0/LLrxVloq9RGrk7xwH3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zHCUWWnuzAjfNYYVJuqBfpAhsDTKeAWvC2ofJuSXOZM=; b=aEpOQoD0gOFg0PGqXWfKbZpKVaKE71w3ihZNSFZnmCcYdBGteUFeKzj4hkjevC/tQi4JEI o0ltMufaB/T6wB6AQvtcwptl+7vcL6ZZbwYOoaqwrYzjLltd5k6wizT5K0WITkI5tLF1Hs eJS6jxM8vwxc8kSI2miQRaZsg/DLCqWdPTZLCxcD7UPZ+IA6xGamRSwAXzMgmUVKPyLMr3 o4DjrCtQyXn0r9Fxsd0QpE3kNnI0FxNIXPY45+p9F+io2VjsNF3M7gO0Q0xaBlG8fP9ncg 5f+1EoMcIJukbogaKpsb3itqN2Vu0O+BOMseHxKVoRUBcJBrNNugKi5SsRWEXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633278; a=rsa-sha256; cv=none; b=EXep+LI9LM/t2nQPw7JnY3WP6ywf4uW2l9eGIWIQjMwkY6jNHDKVoIkZeQ7aOR61hviN/G //CAfZJivDwAn1C+bZ82idx1L4qA5qKflSw1UPogSrhoBARSoH4vL0EbIb9C1te4DhCIdG oJQm++4y3yQamkpb26Jq68wLC14lErWjoIHNq/iBMaBW3CXmTY/17OhgcyvBlsiUAQyijc wfvF1h18hqfuaxy8nO3clmDIusgjxr+xbLVAS/b5mAYA4je+n6h4JDGpQKhmCj1y2tXdGx Nd4kZuFZosfZfMdOkpfdsU55dOySThTZq5zNfMpzc5bAYENr7Pxa3lUNDTum6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bHKjp5gmtz5bW; Wed, 11 Jun 2025 09:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55B9EcaI062734; Wed, 11 Jun 2025 09:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EcaW062731; Wed, 11 Jun 2025 09:14:38 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:38 GMT Message-Id: <202506110914.55B9EcaW062731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 950343a170f0 - stable/14 - net80211: fix TKIP trailer trimming w/ no rx parameters given List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 950343a170f06a0651b725058e0669b8d03b9d24 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=950343a170f06a0651b725058e0669b8d03b9d24 commit 950343a170f06a0651b725058e0669b8d03b9d24 Author: Adrian Chadd AuthorDate: 2025-06-02 00:11:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:45:16 +0000 net80211: fix TKIP trailer trimming w/ no rx parameters given Previous work made trimming the TKIP trailer an optional thing based on what the driver indicated it did with the received frame. However, for drivers that aren't populating an RX frame with an rx status - notably iwn(4) - exposed this bug. If the driver doesn't expose any RX status then just restore the previous behaviour. This matches what was done in the CCMP code in ccmp_decap(). Locally tested: * iwn(4), STA mode, CCMP + TKIP groupwise network Differential Revision: https://reviews.freebsd.org/D50638 Fixes: 731ff40069d28 Reviewed by: bz (cherry picked from commit 36fcd52c2bd5a8a4b3d584564852f417fb83e762) --- sys/net80211/ieee80211_crypto_tkip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index ca474b504fff..0506e2df6545 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -370,7 +370,7 @@ finish: /* * Strip the ICV if hardware has not done so already. */ - if (rxs != NULL && (rxs->c_pktflags & IEEE80211_RX_F_ICV_STRIP) == 0) + if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_ICV_STRIP) == 0) m_adj(m, -tkip.ic_trailer); return 1;