From nobody Mon Apr 01 23:47:32 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 4V7nkD3nFdz5FRCT; Mon, 1 Apr 2024 23:47:32 +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 4V7nkD1Zfgz4QMN; Mon, 1 Apr 2024 23:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015252; 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=yDf33JmlG2JZCuApfD0dyewA6RmuuWdKVjj4hrEOh+4=; b=IhYk55sgaR6D302kprgKLh6e4qoHvT2xYFQJ9Vst1mSuuZ/jQbdy2oOG5PnaWL0Rl1bpJ2 iNcT+x+wcYgqtgRuqoCLtM+GKvejTvvGBeTkDKAki7loRYOLony0J2UDKMtTt2sqdfKZHb vuqUIZ9rl3ZtQ8ZF+jVAjzTt7FSmPsywGYFF9SfM1t6QV+0Z66/I1xIRq+nXGLHjEliexI 0gCej+EcmHcgtm+A9xe2JsmSVhbyecDqvsHb+3O1w38yS7nxFwcUkz31mt9KfU+EaWDZDm UcBqIsn/yAVzsCZgDN1Pi1vHIGZpjVwOsuO8sthbs7YdxNI6N6eNIY+SjlN17w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015252; a=rsa-sha256; cv=none; b=dVE+HL3jM94j4DALly/JXAAaQxiOCOc3y1koxU2K9qUnfxfPolMRWY8M4Qplod46zCy7uD epaWW/CKp/XqiTQDmFxl28+abQNZCAzONtezg3PC+sKMD8mIJQleE1h6r6xeLzu7N7oWId wzFtY3NF15wp5hui4KAnU97ndr+7ejUxN+57Wn2iU2ZWZi0wbOeN/kqmVL4/3dq8bsJG3a tPAUeDJMABC7S21lKBHyIIsoS94rqPK0iz8e7Zh/dGAdkR/3TQcb4GYmQSo+6dBMiya7fe sQmVQYpozj4yMkLnEU+FyffBkCudGwwFOfxS+Ay1vP3EsYtf1LQtEsmzj+61JQ== 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=1712015252; 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=yDf33JmlG2JZCuApfD0dyewA6RmuuWdKVjj4hrEOh+4=; b=BJYfCfMJO1zGuzkhD3kwaICVz5LmAw5ZZ6rEPRJowgFDCOKke8JGvuvRGvVlTb+uKyiRYw JFtk1a8KFrdNjb1nB/hB3Mu8zktTC+u2nNdLCqZbGWw8iRP8gpNiGWBV2cVlzfglR9q+Gu 7+ueG5kDZZaMI13MHaFwvE+wgv8FC/jbBwzd3hPpCsQWgOjewBH6c+dxwg6ON0PUE81iLD vX4O2XscFchyQrVK9UZmujIJ9gu9rQyulTogrtLIreriQxWDIN2uNjl4WA6Fw8N6dPTJIs F/ZuRvjG1oeIlTdsNWKLQpKrx0OJs3fv444vqIXO1BqgZuMCZfHJAiqHv3JU7g== 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 4V7nkD18TczR6y; Mon, 1 Apr 2024 23:47:32 +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 431NlWLp084112; Mon, 1 Apr 2024 23:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlWdb084109; Mon, 1 Apr 2024 23:47:32 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:32 GMT Message-Id: <202404012347.431NlWdb084109@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: e74405a4d648 - stable/14 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e74405a4d6488194a8e6d83a6637a181864f221c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e74405a4d6488194a8e6d83a6637a181864f221c commit e74405a4d6488194a8e6d83a6637a181864f221c Author: Bjoern A. Zeeb AuthorDate: 2024-03-04 23:03:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +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 (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 57b3609b2290..d5a97009200f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -547,7 +547,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: