From nobody Wed Mar 19 22:27:05 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 4ZJ3Gy0lcjz5qp2H; Wed, 19 Mar 2025 22:27:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gx25fDz3b1L; Wed, 19 Mar 2025 22:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423225; 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=H02kdjpLxNZoeWieswNFI7pvuthZC1rY4zFvsCkpzxo=; b=rGMflxzozl1DFz9qrkfN59GiJj5wq21T8hU7G6my5xtiiUprFGoGXpq9AmWXaX3naYWo7c 84zjvZqn8aNE2WH2gRJpaYFY67sPXuVy5Tm0Rli/qVq0ILkJxYLytvKF/g885iajDtYQF+ EfssbVbPpadSxwDALPflhmSOOGoMALgJrJ3DwO1B8UKOZPnwccPZJQ7fa2jykf8DPTMTU+ /JlOBBEFJJqC0g5Dw+ZJyNJBlka4X7ARmSn8E8lyWqAYC58zaH9qxoUdGUec3k5seDTY/w wMA436+sw242eaI9nX9R4Eia4IVXrnFeEOJxe2R1U5SEVtZt+p5lk7VfqvT1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423225; a=rsa-sha256; cv=none; b=Wlc+swZaiaHkLEcZDzuL9wLmu0J+TQlYLnuZst+L/nO220jYw6eGcHJAQGDTVruDsigYMI 2gg1wxlbnYIs5iMBKwiMa10SGk4itROZ1Is//Kp5rxTj5DYOY6T+/tu+jwiY+gd7Ky9xUa djImxR6uVjpjn2Onn8qWsekOjgTpTytLx98bF+UOC5c9G7Hdn/FygQsJ4HLAvXPfubCnf9 sfOHkdm1FzpsEHMJHVe4FlBjc72n2HO8/Sc3knVx96CCY2lxYr+UNh2hO+5MzwOGhadq3L ATlTc912pofNTfhbDAnVKVYxxRQZS5vrAk6w9rIru72efPN9GlgUhfSK00Nh2A== 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=1742423225; 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=H02kdjpLxNZoeWieswNFI7pvuthZC1rY4zFvsCkpzxo=; b=rPeN3J0RzHZ4/W0GFudklAnxo9i0DTrawmP+M6qBIFZ9q2WZVS2Em0trRBYbj59y3uTLQm 7u0TIWo9butCf5IoApG9JPhEHntWFoW1q0cRtdKmDV+nn+aNMkQSMp/l5YTLvteIzNea3K hO9+rnu1PaN+fdJtE7/qz90KTwx6VobyKIfvsy/zudeC/vHTrWnifqFpwt3Uql3rjToavE kLrCqJTDgCPS0X4HwwhxT7VAZqxLHRUp8KTO81XcvHh4IEgeBX078REqSepUcHX1K1zBoX zWmr3NgdTMjbaadsYJOzzU8wqQSlCvYAPYqsosd5tOAaCp51uHr8+mXL4m6QLA== 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 4ZJ3Gx1gPSzfgk; Wed, 19 Mar 2025 22:27:05 +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 52JMR53n044611; Wed, 19 Mar 2025 22:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMR55i044608; Wed, 19 Mar 2025 22:27:05 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:27:05 GMT Message-Id: <202503192227.52JMR55i044608@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: f966ed85ac95 - stable/14 - net80211: Fix IEEE80211_KEY_UNDEFINED() in ieee80211_node_delucastkey() 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/14 X-Git-Reftype: branch X-Git-Commit: f966ed85ac954bfe89652eb8bce7115a9207fc82 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f966ed85ac954bfe89652eb8bce7115a9207fc82 commit f966ed85ac954bfe89652eb8bce7115a9207fc82 Author: Bjoern A. Zeeb AuthorDate: 2025-03-05 00:02:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-19 22:22:15 +0000 net80211: Fix IEEE80211_KEY_UNDEFINED() in ieee80211_node_delucastkey() The adjustment of the check in 9763fec11b83 inverted the logic. Fix this. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 9763fec11b83 Reported by: KUROSAWA Takahiro (takahiro.kurosawa gmail.com) in D48980 Reviewed by: KUROSAWA Takahiro (takahiro.kurosawa gmail.com), adrian Differential Revision: https://reviews.freebsd.org/D49234 (cherry picked from commit 27bf5c405bf2eb69392e45c06605defc78882612) --- sys/net80211/ieee80211_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index f2fc3d21a361..ae22dc036bb6 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2209,7 +2209,7 @@ ieee80211_node_delucastkey(struct ieee80211_node *ni) IEEE80211_NODE_LOCK(nt); nikey = NULL; status = 1; /* NB: success */ - if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { + if (!IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { keyix = ni->ni_ucastkey.wk_rxkeyix; status = ieee80211_crypto_delkey(ni->ni_vap, &ni->ni_ucastkey); if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax) {