From nobody Wed Mar 5 21:19:00 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 4Z7QQs0gJdz5qmn1; Wed, 05 Mar 2025 21:19:01 +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 4Z7QQs055Kz3vf8; Wed, 05 Mar 2025 21:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741209541; 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=KcWODdC49ES3SnROkXinagvelHR8A1LySK/Gi4miH8E=; b=LyIwBggi4FI1g3KdFv7M6NYiW5BI50Iu5esR/V6hK8X3eX8j2baSGlqf7KBieuW/mwUC3/ +CUAi9/2naWPm/AMzS9OjJKhotwaQJgdpI3ZjyOMGiMd/zca2VnNjHwDnqjvNfAwEBMVFL 37x2z3UwZTCW0+4/xDNrnj5jK71jlo8+tV0RXG5EGSRevjUsRqGVSymrrdsTjRh+nxx+mj nRkVlxbhUGS2PzqbXl8q37cIN04ACOqSVn0aKexPyO8JqLHPff6hS63cAIdqTKX/1WKz97 6QrsFeCY3w15ELSMG66dcnUSeB6XOH9EJNVzivRULxw30BH8FEGKLPyTdOqInQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741209541; a=rsa-sha256; cv=none; b=vmWNTB1qytefSLOkZy8t+/bELjZ5ywAtzpMWd+j6PKQl7veOxkSOUv65SyO+xktJzco8CQ c7x0znLj/E1PMdv7UuMDCeDjtTyUUd9VHGOlACjy4qoCGfHGN164OWnDj066YgnYer6oDa 0G8EkqK26H08iHBlvZb7uuLPzHGANtIrItkmAu+q0ASB9CNMuEnyA/pGkS7CmCktEIB+4m XB3OAEyUqSvTaExq5mxQP+2VDE0FZhzj1FIJ30q14BPo2AnJ/RWuVT/f+mtYiMUV3dnDN1 NvU1gCMtWvrNr0gPM5WXuJnpRpM/mapEzemokR3HbJTG/QnZt4RWtha0w/OhrQ== 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=1741209541; 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=KcWODdC49ES3SnROkXinagvelHR8A1LySK/Gi4miH8E=; b=iDJdanKCLFKncqM49NwvPRoG5opdq/n0RU7UFg6kNyNBQzJikEgD4H0uVDZ3J/iJ5tUk27 VO/VuL+LaauCH+8dpUfYUhqKPdG7Gt7i/ExoJPK4x/6i79SoVHActoiFSR84iqWkfIhFcM UvfoxREcUvi+DJKrHmEk6awcPpSbCVgYe6uCHuLdXZUBicAt0qH1r9m6yYqsofpFX5RHhX Fg7QsTPSKCYHuAZvnWhYKckONorgI6pFZRxfpaiLTHrnY+42+49f9Yq2W11u+Q7AB+eXR4 Q1tJIivKU0DBeWNnSOGZ+Y7BTtZWjGusxQEr0uRZYaZOOcnOmux/66//AquQ9Q== 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 4Z7QQr6PPfz60V; Wed, 05 Mar 2025 21:19:00 +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 525LJ0ST068882; Wed, 5 Mar 2025 21:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 525LJ0cg068879; Wed, 5 Mar 2025 21:19:00 GMT (envelope-from git) Date: Wed, 5 Mar 2025 21:19:00 GMT Message-Id: <202503052119.525LJ0cg068879@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: 27bf5c405bf2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 27bf5c405bf2eb69392e45c06605defc78882612 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=27bf5c405bf2eb69392e45c06605defc78882612 commit 27bf5c405bf2eb69392e45c06605defc78882612 Author: Bjoern A. Zeeb AuthorDate: 2025-03-05 00:02:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-05 21:18: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 --- 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 f4185dfb04d4..a495f2f78113 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2206,7 +2206,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) {