From nobody Tue Apr 29 11:41:57 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 4Zmz1f25qxz5tvNf; 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 4Zmz1d3kHJz3xCW; Tue, 29 Apr 2025 11:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926917; 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=xWPWA5ERgt3S+1lYlWgxhTLBWkkzqy8EXmMs+jeTxTg=; b=bsKkolzWXuC8prELElPYY3B+NJJGPIv67L/aJYsertdpByksMalw76Hyp8QbfQvaFHFKc7 c8nJPJkr4aj7wGgTpRQTaY6rL0hzjwmC78nS5Rv0Ur6vBjcopeg4JUghmGDo1mim3HJcaa Wj9Vu5Pwv/la9L/MyIzlsUhUk4E8btm+WWtuQndj08Q8HZvMXatVwBvNwJeGr3vhROaYFu cF8lVmlIIXbu3xNzjSQnuuHrwz6ZUOrZ+pZAX+FXB4NGtTRPuytN6nNwqVIyDnAdK1aYpR lhDlBrcyxC+s0q1oca7S+7Oo8K27ZpIQyGwrjVIEitSuENz8xEhlXSSnOt1tvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926917; a=rsa-sha256; cv=none; b=w8Rz67ebS0D/y+a2FHkUKCY/FZQCUPWFhNn30m2VWe6sCO5HFfwi4HgF6j8i7P2V/bowu7 ykxDBuQ53Cqn1E81ScIuv62Eez4JCa/bX6b1MQO//xNoZ4PcSHb+JhdD6t3R7lc7RaL5yp g291h6yowdF1ql4ekollM+2iiccGP9B1ooVW9t+yd4YBf0LxYZuaOgmX/1LC9ty6CgBdVW JdlCM6rf7H+NPlAejTuAF3EnpgKqZ06j1oCiJyWTc2Kcb4OyRzBrbau0Kr/VgN8DCDO19Y XQ9TQ1sKR7cipBbZjf/f91KuAjS90+i6z98nvS4eWTxIQfdDGQ0tHWwtMan7yw== 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=1745926917; 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=xWPWA5ERgt3S+1lYlWgxhTLBWkkzqy8EXmMs+jeTxTg=; b=GwIGeJbE64lOdgwW1SiChs8fKvwTQk3Uvi6m6M8UpAo2eogukmiFdJcQAu+419WmlZdz5j aemxOxuw/yCsEgSmUJOWEi8EoIe0PDfQLFM6yBu/gRmAwMJMarpLyST8u7Nf9oSG38PNJi mF7m48qQ5aruK02zelzgKfhVbT8m4t9o0eFQOHd0gKnIqSeV3ORLeS6HHRA9ZEys0z2I/O +/g8rxa+Q+jjN2Rsk7mkiC7grBZ6+lH4fhyLFhXPuEru25mDHjV/4kMnTrs6tXFECojSqb 2iLuvtPms8Xp/1LpuonsUaZBpkVTd8D83V/7F1iZJT7UxoiCgHbah0KqhELZ/Q== 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 4Zmz1d33Hcz43m; Tue, 29 Apr 2025 11:41:57 +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 53TBfv2a046437; Tue, 29 Apr 2025 11:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfv3S046434; Tue, 29 Apr 2025 11:41:57 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:57 GMT Message-Id: <202504291141.53TBfv3S046434@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: e2e40ccaf1a1 - stable/14 - LinuxKPI: 802.11: add the key mgmt for TKIP and extra checks for CCMP 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: e2e40ccaf1a1312679b402f925f5d78f796bc43a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e2e40ccaf1a1312679b402f925f5d78f796bc43a commit e2e40ccaf1a1312679b402f925f5d78f796bc43a Author: Bjoern A. Zeeb AuthorDate: 2025-04-15 21:28:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:31 +0000 LinuxKPI: 802.11: add the key mgmt for TKIP and extra checks for CCMP Set iv/icv_len for TKIP as well. Add checks for both TKIP and CCMP that we do not get any unexpected or unimplemented flags back from KEY_SET. Sponsored by: The FreeBSD Foundation (cherry picked from commit 92942717fd4cdcfac4c51a46accd3e5ed532cdb7) (cherry picked from commit 91716e8dc1a3452fecedc724e5ef0274413ce7a0) --- sys/compat/linuxkpi/common/src/linux_80211.c | 75 ++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 86a8286d66eb..d6eeaf01d56b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1352,6 +1352,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) struct ieee80211_node *ni; struct ieee80211_key_conf *kc; uint32_t lcipher; + uint16_t exp_flags; int error; ic = vap->iv_ic; @@ -1390,8 +1391,8 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) k->wk_cipher->ic_cipher, k->wk_keylen); switch (lcipher) { case WLAN_CIPHER_SUITE_CCMP: - break; case WLAN_CIPHER_SUITE_TKIP: + break; default: ic_printf(ic, "%s: CIPHER SUITE %#x (%s) not supported\n", __func__, lcipher, lkpi_cipher_suite_to_name(lcipher)); @@ -1423,6 +1424,9 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) kc->icv_len = k->wk_cipher->ic_trailer; break; case WLAN_CIPHER_SUITE_TKIP: + kc->iv_len = k->wk_cipher->ic_header; + kc->icv_len = k->wk_cipher->ic_trailer; + break; default: /* currently UNREACH */ IMPROVE(); @@ -1460,6 +1464,53 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) kc, kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif + exp_flags = 0; + switch (kc->cipher) { + case WLAN_CIPHER_SUITE_TKIP: + exp_flags = (IEEE80211_KEY_FLAG_PAIRWISE | + IEEE80211_KEY_FLAG_PUT_IV_SPACE | + IEEE80211_KEY_FLAG_GENERATE_MMIC | + IEEE80211_KEY_FLAG_PUT_MIC_SPACE); +#define TKIP_INVAL_COMBINATION \ + (IEEE80211_KEY_FLAG_PUT_MIC_SPACE|IEEE80211_KEY_FLAG_GENERATE_MMIC) + if ((kc->flags & TKIP_INVAL_COMBINATION) == TKIP_INVAL_COMBINATION) { + ic_printf(ic, "%s: SET_KEY for %s returned invalid " + "combination %b\n", __func__, + lkpi_cipher_suite_to_name(kc->cipher), + kc->flags, IEEE80211_KEY_FLAG_BITS); + } +#undef TKIP_INVAL_COMBINATION +#ifdef __notyet__ + /* Do flags surgery; special see linuxkpi_ieee80211_ifattach(). */ + if ((kc->flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) != 0) { + k->wk_flags &= ~(IEEE80211_KEY_NOMICMGT|IEEE80211_KEY_NOMIC); + k->wk_flags |= IEEE80211_KEY_SWMIC; + ic->ic_cryptocaps &= ~IEEE80211_CRYPTO_TKIPMIC + } +#endif + break; + case WLAN_CIPHER_SUITE_CCMP: + exp_flags = (IEEE80211_KEY_FLAG_PAIRWISE | + IEEE80211_KEY_FLAG_PUT_IV_SPACE | + IEEE80211_KEY_FLAG_GENERATE_IV | + IEEE80211_KEY_FLAG_GENERATE_IV_MGMT | /* Only needs IV geeration for MGMT frames. */ + IEEE80211_KEY_FLAG_SW_MGMT_TX); /* MFP in software */ + break; + } + if ((kc->flags & ~exp_flags) != 0) + ic_printf(ic, "%s: SET_KEY for %s returned unexpected key flags: " + " %#06x & ~%#06x = %b\n", __func__, + lkpi_cipher_suite_to_name(kc->cipher), kc->flags, exp_flags, + (kc->flags & ~exp_flags), IEEE80211_KEY_FLAG_BITS); + +#ifdef __notyet__ + /* Do flags surgery. */ + if ((kc->flags & IEEE80211_KEY_FLAG_GENERATE_IV_MGMT) == 0) + k->wk_flags |= IEEE80211_KEY_NOIVMGT; + if ((kc->flags & IEEE80211_KEY_FLAG_GENERATE_IV) == 0) + k->wk_flags |= IEEE80211_KEY_NOIV; +#endif + ieee80211_free_node(ni); return (1); } @@ -5956,16 +6007,32 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) uint32_t hwciphers; hwciphers = 0; - for (i = 0; i < hw->wiphy->n_cipher_suites; i++) - hwciphers |= lkpi_l80211_to_net80211_cyphers( + for (i = 0; i < hw->wiphy->n_cipher_suites; i++) { + uint32_t cs; + + cs = lkpi_l80211_to_net80211_cyphers( ic, hw->wiphy->cipher_suites[i]); + if (cs == IEEE80211_CRYPTO_TKIP) { + /* + * We do set this here. We will only find out + * when doing a SET_KEY operation depending on + * what the driver returns. + * net80211::ieee80211_crypto_newkey() + * checks this so we will have to do flags + * surgery later. + */ + cs |= IEEE80211_CRYPTO_TKIPMIC; + } + hwciphers |= cs; + } /* * (20250415) nothing anywhere in the path checks we actually * support all these in net80211. * net80211 supports _256 variants but the ioctl does not. */ IMPROVE("as net80211 grows more support, enable them"); - hwciphers &= (IEEE80211_CRYPTO_WEP | IEEE80211_CRYPTO_TKIP | + hwciphers &= (IEEE80211_CRYPTO_WEP | + IEEE80211_CRYPTO_TKIP | IEEE80211_CRYPTO_TKIPMIC | IEEE80211_CRYPTO_AES_CCM | IEEE80211_CRYPTO_AES_GCM_128); /* We only support CCMP here, so further filter. */ hwciphers &= IEEE80211_CRYPTO_AES_CCM;