From nobody Tue Apr 29 11:41:58 2025 X-Original-To: dev-commits-src-all@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 4Zmz1f6nDhz5tvFT; Tue, 29 Apr 2025 11:41:58 +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 4Zmz1f4B6Pz3x39; Tue, 29 Apr 2025 11:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926918; 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=4x0QyvYfaF8nJewTviOUw5bL0TF2Fb4BYP1vkIATZxs=; b=m7s2BGzElFyNnUJ1KlNW4AgxPn6/f9WkHcGnlzGwCTX6Vpo78Nu0uxtMFnMVJ9sW9MjYwb N/hzryqs+NCgP4/s+i9Yh9xnbefG6+A4Tn1nYhXP2SAINXZu+ATRpW7fpfSX4mLbJQGKK8 fDnUDH9yYmo44iiQpEyxjytRlVx+Wfa4IDZipZB56zHuANBYf3Adp0Su+KrCXi2Yrh4TsJ FimyMNRe2+MzNmLrBgh74zw9lqT5thhD+p61SSZIC1iwUBrw2yGk4NgT1anUsfYi9/kVVE O3e6FsIYjbABSz6T8zDRL7bsdbAA17/igPeX3gIxn4GVMFL0BFJJR1RaVjqXMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926918; a=rsa-sha256; cv=none; b=nthXHhQdnhSZKD5xeeng0TYHGUBUm40VPVufTqMJQz4zafviJ0JlRKsriimGr92rHCjJwJ UXbvXdk9vDvCbL7ruI/0MX9rRozccKCFEBYt8dsrBLzdsTEWPuRpqZc9C9w/iW2TbaFx65 kzE1PH1geq8BjNySZv1QkjgRfqOZheWSROQzIC3Hp0A/WuoxNlTKIK6vPiPyV7i/i5oaZQ odxS+htuIOaUanQJJ5TryMQLnmG4F0mBX9ofWfSH5/n+vo04TzmzES7l1PGptr4aQtavm3 Zv0wYH6Rokz99BsFA0XOlywa0Q/FFg6GJZlVyOrDGdJcK/VTyEC3uhcs2H2fbg== 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=1745926918; 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=4x0QyvYfaF8nJewTviOUw5bL0TF2Fb4BYP1vkIATZxs=; b=B0wVxJkR63j/rDihUraCe9ihnPcR+ZgtpieFaFevI0OCK8gakhx98C6z/yfX9OkrPI0hnA b6sC6cGRi5q/+O2n/JXE/chjvkS/T5OqNTeDo63Vsf1L2eQC1Ua5XX2bljT6G4mlZPzmJg rk1fcAkszmrsusP6VdI7sFnHNuYEYH2KS1l4ZQfJItB69NrZp5s6NJ+qItUM2kqV4VBJv3 13tNEDOeG3GZpQZlD0CK6Mzy1AnF7bti8w54utSwTNSz82JvEKrSrQkQa40QEMezRg/wmn /aBCBUJQ9JpQKmwALz45AeViK5DZUsPRwGnJ9tSWc0kbJ3cpgXS8Yk3ylPfoWA== 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 4Zmz1f3jpzz3jS; Tue, 29 Apr 2025 11:41:58 +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 53TBfwsg046474; Tue, 29 Apr 2025 11:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfwOn046471; Tue, 29 Apr 2025 11:41:58 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:58 GMT Message-Id: <202504291141.53TBfwOn046471@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: d416d659b90c - stable/14 - LinuxKPI: 802.11: fix TKIP RX/TX MIC offsets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d416d659b90c77e0b0872114e3dd2e8e061b1aaa Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d416d659b90c77e0b0872114e3dd2e8e061b1aaa commit d416d659b90c77e0b0872114e3dd2e8e061b1aaa Author: Bjoern A. Zeeb AuthorDate: 2025-04-16 08:18:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:31 +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 (cherry picked from commit a23908728efce08cfd10b13ed34de1361d0a980f) --- 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