From nobody Wed Jun 12 19:16:53 2024 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 4VzwJj4gt3z5NHhm; Wed, 12 Jun 2024 19:16:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzwJj1xxmz5713; Wed, 12 Jun 2024 19:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718219813; 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=cie1NNB94d06DDKcK1SqXg0Asyuy/xSgMA7bI0xmCkY=; b=sdyRaW8rNYRiVOx12NSNtGKCD5JmsOPD5GEZ7TDe9Jk2MP7i8DZFRu4sH2VQZDzquf6JCq wP43178og5NGvcvHy/+o31nHvZ8ASTDUlHynYtIgB/8thQOnq/d+lW9G+GbAWejJL4pzbP xqh9B2DJBpM3qjIa1L9Q6hQyZ/dlKEKLc6qpxF7Ag62C3OP4gaWNI/Q7UQILIWrq3Izl3P 1vMHo+8YGA9GlTpHsdIe2iD0cK/+J6AmEdlQCtqipVZbhg73VW4IfM98RqYK+HPmi7UwKI YkAnHDs6AvA0XqXY3r/DtIr070tpsvTuM0YJhUFyvu7bZOIvlbLpsdcE+iguiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718219813; a=rsa-sha256; cv=none; b=fFMMUIb7rdw+Jghid9viiAi75DkJ0ZUdoV/Shf9ELstpUUBL5C46wOpjA9Fnfl9h7MmbMu 2ud43+nMk7iVNZAal8WhefXIC/A+QVXY4H6sMODS9EEa3i6/66stH/YLzPVYys/uDDCl7i sRG2X3QTU14SvorGUJlPRJ1NqAvFFraV/AZRw/2nS2yNn7sH9iCYRlhdgVyQpDC7Fa3c+b Eq70aaYKxJQElNSwHA1X1ZX2s2qDbQ0lAEocoDBDtCwwzkeRTzHguTLIigMuehuyZJBiPx 4HEw/sSSGrYfUkSrJ5dHDLQmZnajr40z2lqIlSvme2RKeDAS+UPQMHJJilf+9Q== 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=1718219813; 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=cie1NNB94d06DDKcK1SqXg0Asyuy/xSgMA7bI0xmCkY=; b=fO+615iBIyKbHKumGpjRpc9KwE1vL0+Y3KRxIyivC1IYHnO82xf39k3nY332PetFytR9Co xDIMgwTD/biLI+BfPr3ZtLaCXlpYdWEUCJHW+w9hgZcJvqKDzMq5bjRjKCYF1M5EYu/yod NV3VpjUSdbypSmyx1KNJ1GUXoIbF+KRSUE6EutJUoZVwJXyMXJt5id/o+OhcIfZHUUIBUY guHppYVKjQOphyTG4sKHz9O0sXy7Om26VJeRNh9Wfj7YhzyC4lLh0H7ENjuw8VAM24XuM4 m0As6j7j7SREqSLoiUiV+gyTgnmodrZarbig+Twy7IErJNHsNm2FY5nsIaJL4A== 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 4VzwJj1WVMz14Dh; Wed, 12 Jun 2024 19:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45CJGrw2004224; Wed, 12 Jun 2024 19:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CJGrHZ004221; Wed, 12 Jun 2024 19:16:53 GMT (envelope-from git) Date: Wed, 12 Jun 2024 19:16:53 GMT Message-Id: <202406121916.45CJGrHZ004221@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: 7cda20918644 - stable/13 - LinuxKPI: 802.11: return proper value for IEEE80211_CRYPTO_AES_CCM 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/13 X-Git-Reftype: branch X-Git-Commit: 7cda20918644f283590a5bb348066bdc2bef18b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7cda20918644f283590a5bb348066bdc2bef18b8 commit 7cda20918644f283590a5bb348066bdc2bef18b8 Author: Bjoern A. Zeeb AuthorDate: 2024-03-04 23:03:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-06-12 16:59:35 +0000 LinuxKPI: 802.11: return proper value for IEEE80211_CRYPTO_AES_CCM In case of LKPI_80211_HW_CRYPTO we convert from LinuxKPI cipher_suites to net80211 ic_cryptocaps fields. For WLAN_CIPHER_SUITE_CCMP we accidentally returned the bit number instead of the shifted value which leads to ieee80211_crypto_newkey() setting IEEE80211_KEY_SWCRYPT, which in turned lead to us trying to decode the frame again despite HW had already done it. This was found out of a discussion in D43634. Reviewed by: cc, adrian Differential Revision: https://reviews.freebsd.org/D44208 (cherry picked from commit 906521f8176b13533556d742db4ab28e847b85c0) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 876ff3693bd0..e5fcb81dce6a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -546,7 +546,7 @@ lkpi_l80211_to_net80211_cyphers(uint32_t wlan_cipher_suite) case WLAN_CIPHER_SUITE_TKIP: return (IEEE80211_CRYPTO_TKIP); case WLAN_CIPHER_SUITE_CCMP: - return (IEEE80211_CIPHER_AES_CCM); + return (IEEE80211_CRYPTO_AES_CCM); case WLAN_CIPHER_SUITE_WEP104: return (IEEE80211_CRYPTO_WEP); case WLAN_CIPHER_SUITE_AES_CMAC: