From nobody Wed Apr 23 16:25:22 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 4ZjPbR1kXFz5tbgj; Wed, 23 Apr 2025 16:25:23 +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 4ZjPbQ4jLGz49S7; Wed, 23 Apr 2025 16:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745425522; 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=8N3yJGHE75M0sTfR5Ooj3s3aw9VqvSXdRzxM2BSib48=; b=Ltz2mGXhb0lB7KIl2xOO4D9+ayFMgWQHsNZ4pHyndJMzO5mtCLL3uYAdCcB3s+3FHVk/an djCh65RE5N/zQkSzdM1haHqkEYHCqwqN71qThbOi4U2LYcb37OGQfJK6Xpucf8VLcwhEca 1OohS/Rq8wSyh+94coHFhmHbvmmGgWHiHLC/KdfkqgvYb8L5TgIXeYAGhRx0Q6pnh7xiPW JemNxJh+akaPZY0sSKt+JU2utUKkZH98gqPT2EmZUTus3g8Vz4BiY/PGxVrfAMxlgToy1t uAlESMbfCxZTnR5q51SzcTF8RMy+32Iyen8UAwwdD9xmz6KRBVLoSMt6Niz4lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745425522; a=rsa-sha256; cv=none; b=LVNHge1R9JBkBtOLsq2nn+wyB8Gv4janmqfZGxIyOPi65W7veksM77KC70x00Ycd5o4bZR vBHq700bbnhIse19BqNkei9hx7LgOPNEFAMXu9LSyFd6dce0+Z0/bpL/AN+XSGeEwtC3UT 7A2fvFp0YDqph/PVoK8espqJBq5aQ7kdBf3GToaXW4K3ml4LRgS98b9kkQVgfhiCS+CLNQ XG6RwXF32yG+bEIOdK8swTEoQIxqEK70kFk/59zZ6N6N8ylXqrfTbwIptlQ8Lb6fDMx91l aVI5PrFarLc3fVJla/uNTCFRo1DZYc3ToIgmLOFUFXJAbV2v1mljhJP+U2z/Mg== 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=1745425522; 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=8N3yJGHE75M0sTfR5Ooj3s3aw9VqvSXdRzxM2BSib48=; b=WWjxId0dEz7iz/QM9FyoyoeYX0rn9Hdb6KaaVQBnhMUcvD3Cve06sMxAUbJuMwahN4c5yy y6/qxsm8B4l51jB+PKUTQ0RQVOCGbWhoBBDIrmBBf4pszXThHqZlsUAjCtntxi4fqLSZXv hmnEnd4jOws/buZ73vdtiqB9MKOn7Wtfnt3E2Np+mCAwIcJOnFw9IbNuM7uJKXGWToxyRH 87q3rNVEs4gdzO3O4mmsGJvmZ8VUoJhhr8pzW07Q6rP+1nPGkjI85TyTDI8JrJihSdtJWD HpLR2kxo+NLDS0bqHOf5rLFAFdpwgZDA9u9Kvn6ue2L1otPCNC4KHLsGHC8qww== 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 4ZjPbQ3qftz19vW; Wed, 23 Apr 2025 16:25:22 +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 53NGPMfR081987; Wed, 23 Apr 2025 16:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NGPMVX081984; Wed, 23 Apr 2025 16:25:22 GMT (envelope-from git) Date: Wed, 23 Apr 2025 16:25:22 GMT Message-Id: <202504231625.53NGPMVX081984@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: 92942717fd4c - main - LinuxKPI: 802.11: add the key mgmt for TKIP and extra checks for CCMP 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/main X-Git-Reftype: branch X-Git-Commit: 92942717fd4cdcfac4c51a46accd3e5ed532cdb7 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=92942717fd4cdcfac4c51a46accd3e5ed532cdb7 commit 92942717fd4cdcfac4c51a46accd3e5ed532cdb7 Author: Bjoern A. Zeeb AuthorDate: 2025-04-15 21:28:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-23 16:24:21 +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 MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 74 ++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 88c3445423c5..b9d8cc7263ae 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,52 @@ 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. */ + 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 +6006,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;