From nobody Wed Apr 23 16:25:23 2025 X-Original-To: dev-commits-src-main@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 4ZjPbS2zmjz5tbdM; Wed, 23 Apr 2025 16:25:24 +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 4ZjPbR52X7z49MS; Wed, 23 Apr 2025 16:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745425523; 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=efEYy2O3z/Mci1ORLqYuhEUuHDdagF7zwg8XJUXwKys=; b=je3ko1tuCuyNgrcNboDE/ojuQ2jLC2z9mo/SZd1M+SiGAP7DPYDITSlpXx+Gtza5PiiBG2 69Q3tODdfGonJ5QASgYC+/UWrFWHYJ7gtAwd/tp/W/ngLZqRjkpwSHQKS4H//FSFxJMZwX x4XuL7IonHNfQclXe2JvcziVuotV4dC38y5QO7PhhaR2XQrN1TzvTeJCWlHeDo17jZqUQB 4kIAtRX3SVoG1MIuCdsPzN+R3na4yjmgYPjH/Xq7BrNUW9llkFOaKU4vwQB9vUVF5pN4v0 q3soD9yTYbodaPxlPQYJPHIvNWNy12BZ1cM4MjGZY71MRXS78uuQWUTXH3RO6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745425523; a=rsa-sha256; cv=none; b=TL2bUO7OQX1P17cmJtI9nV56cxK3cI2CwVdA8cJ1jqzzlJPHSPgD6rLSPoERzjVtQOjl/8 qPL0y+VAsrNZYgBQRS3L6j20FazMa+2/xxU5xARvSmpj6mjNPFAmi0VudIHrSjuXtyoc9/ wruIoN7c3UGpG41tJzOJ9i/2/fCm4SgFT6nzNVkFYY6Oum6WbGX8EbcroLdTOgjr66V4OB QKbD/E3OrU1IpL1OVaIHdPqi42uWMCvZaqOGr3qruxLmCNqhUWYjGp/Fkgcb0W9PgAfBrc R5se4DRu1WuYWiuENmgwUatsPdY8NX/Plm1hTC/WSZER1YhgwqR3TftCs5EULQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745425523; 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=efEYy2O3z/Mci1ORLqYuhEUuHDdagF7zwg8XJUXwKys=; b=Cr9LR08Ddym7wcZf57VISHcW3SSm9OS69/h8CH+MOWBrSGw90xqEQ/mYMGELcdgLE5usNA 4x0SwhlFK0XZnc9vI+Kqdwcra1xDRe/ZD7kU+Xpb8GLmqJalCNoe5jwCBwLOxZlaPw87cg X40+ofdzTN+cRNVjjQyb7VglSir6uHloaocO/JEkdaTi+5nx09MhAdHtTdWErQ89BZbg5V Mm+/MFojLsslcwCxR7td2DnNfyGg3NI/2xORYlixYQHn7KKMkg6qZmR8CQzVqwT2UqlosQ wt72pREg4orCXMmZO0kAaUVEm05ZJ/nayVa2Z3rC1xNsmhcN12zjI2a4JtBrQg== 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 4ZjPbR4TjMz19mT; Wed, 23 Apr 2025 16:25:23 +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 53NGPNCq082029; Wed, 23 Apr 2025 16:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NGPN2L082026; Wed, 23 Apr 2025 16:25:23 GMT (envelope-from git) Date: Wed, 23 Apr 2025 16:25:23 GMT Message-Id: <202504231625.53NGPN2L082026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a23908728efc - main - LinuxKPI: 802.11: fix TKIP RX/TX MIC offsets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a23908728efce08cfd10b13ed34de1361d0a980f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a23908728efce08cfd10b13ed34de1361d0a980f commit a23908728efce08cfd10b13ed34de1361d0a980f Author: Bjoern A. Zeeb AuthorDate: 2025-04-16 08:18:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-23 16:24:21 +0000 LinuxKPI: 802.11: fix TKIP RX/TX MIC offsets TKIP has a special key buffer. While keylen only identifies the key length, the two MIC are appended. The LinuxKPI offsets for these were unfortunately never set correct which lead to constant Micheal counter measures as the MIC never was correct when calculations were offloaded to firmware. This is the first half of the fix. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/nl80211.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index b2a33a28b3a7..f3979d3a2abc 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -190,8 +190,6 @@ enum nl80211_tdls_operation { NL80211_TDLS_ENABLE_LINK, NL80211_TDLS_DISABLE_LINK, NL80211_TDLS_DISCOVERY_REQ, - NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY, - NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY, }; enum nl80211_cqm_rssi_threshold_event { @@ -436,6 +434,9 @@ enum nl80211_hidden_ssid { NL80211_HIDDEN_SSID_NOT_IN_USE, }; +#define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 +#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 + #define NL80211_KCK_LEN 16 #define NL80211_KCK_EXT_LEN 24 #define NL80211_KEK_LEN 16