From nobody Wed Aug 19 02:07:25 2026 X-Original-To: dev-commits-src-main@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 4hPqhZ0kr6z6pHVV for ; Wed, 19 Aug 2026 02:07:26 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hPqhY6rtJz44rl for ; Wed, 19 Aug 2026 02:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787105246; 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=9wYLocbyzILU9tg7JRc+Mc4e0n+MQObuhLa4A7zTtMM=; b=ktm7gHBuUKCx+VBzBgwkF2r+Sph3CStYDadCZrsMEPngtus50O2IQgvmm7N4nos0s2nnO4 oVWHAbtrJJelhGmxUV17MM3H67YDJwzmdsXI7Dz7UlhQ1GIrc923JOSRI27OQD8K9Ifhy+ 7W1xwwBMAqzni21xCRYYm6NryudP75FISCbQxTyYCusUojau5MowgtbQLhA3tXO/RPJjNq vOQ6e/bqPPvIrltqeAWyW7KvmFkyYjxBJkQ9UINcTxmRFCnWTjutTTJwUv7PL0xHHRpdT8 QwrBSwO+TXNKlqpgPZmAGYdKAOX/dRHubXPPhiR/RDUwNB+un+JYfcghA2VdhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787105246; a=rsa-sha256; cv=none; b=NWijmRX7LcqsqhiT4tCJTlJku2Fw5HuMLFJ21NvsUdysgScoycHmfXlyyFAySeaSY/1nk8 McS2V1peIUqbbhXsyi3NBq/BVQP+BGS2hO6aQRZ4qTF/3FS3IEyP53cjzzfLNw+bVR4//F vniVJ+yDBUK0/tLNwL7M+D4QI59v4lM97EJYToIDrrZzzAKiU3VRRAlCIq9cBrgNEHa2HP d93A4CVp97ao0GcQ5pPVHJcPoiROEqNR7Oe2cKGZCCmVbzWDxGqKWcKFHr7+/pPnQZEwu7 hig1Sl4JwFNfpn217S1/NRQQ8bVFi+RNU62qYW9+PxDbuhaFwKvmxGMY5+G6rw== 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=1787105246; 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=9wYLocbyzILU9tg7JRc+Mc4e0n+MQObuhLa4A7zTtMM=; b=PwBs4gwdjqBHIryYq/CspM8f/3zeqSC88LFmbK10Zo3mjDRiwdPvBNnL1lvr7nnlcEstiN kAXoKERdZorc2fOpcKHFiitl7ff9SzbvhENqqpfCda8SGma90T05lEvA7xxH0rsWwE41eS xGJl2nL+tC0D07SRDmQJ6oT0eN3PfUq8ZBD+uHZV8zVLSdAWhdwQx4HCkSRvdDW3GMeLyc f5OQ3HeszjdN22t3ngdS/QUyinJv256MbwqdRUi0S97aErD89OQMBPsDayfXlQb/4OIr4O EqV+/blU9AHDNZnJvkjRPKArZd5dndPNWiBZ2+Qeak/48kCCie6MByHd5Q5plw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPqhY5Y47z18DB for ; Wed, 19 Aug 2026 02:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f70c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Aug 2026 02:07:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 874035c11cd4 - main - net80211: fix WEP transmit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 874035c11cd40282cb5d654749a99b03b9233502 Auto-Submitted: auto-generated Date: Wed, 19 Aug 2026 02:07:25 +0000 Message-Id: <6a850fdd.1f70c.27efd025@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=874035c11cd40282cb5d654749a99b03b9233502 commit 874035c11cd40282cb5d654749a99b03b9233502 Author: Adrian Chadd AuthorDate: 2026-08-19 02:01:53 +0000 Commit: Adrian Chadd CommitDate: 2026-08-19 02:01:53 +0000 net80211: fix WEP transmit This was broken in 2022 with a security fix (61605e0ae5d8f) which disallowed defaulting to the default TX key if there's no unicast key. Unfortunately this path was also used by WEP transmit. To fix it, add a separate check which ensures that WEP is configured (authtype OPEN, privacy enabled) - then also check if the default TX key is set and that said key is a WEP key. Fixes: 61605e0ae5d8f Locally tested: * rtwn(4) AP and rtwn(4) STA w/ static WEP keys configured Differential Revision: https://reviews.freebsd.org/D58854 --- sys/net80211/ieee80211_crypto.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 3dad4ce77d3c..2d85d3d5ecad 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -674,6 +674,24 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_frame *wh; + /* + * Explicitly check whether we're doing WEP and allow + * the use of the default TX key. + */ + if ((ni->ni_authmode == IEEE80211_AUTH_OPEN) && + ((vap->iv_flags & IEEE80211_F_PRIVACY) != 0) && + (vap->iv_def_txkey != IEEE80211_KEYIX_NONE)) { + struct ieee80211_key *k; + /* + * Check to see if the TX key is a WEP cipher key. + * Only allow transmit using it here if it's + * a WEP key. + */ + k = &vap->iv_nw_keys[vap->iv_def_txkey]; + if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_WEP) + return (k); + } + /* * Multicast traffic always uses the multicast key. *