From nobody Tue Mar 18 09:22:12 2025 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 4ZH5vn3DFgz5qKqT; Tue, 18 Mar 2025 09:22:13 +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 4ZH5vn0kvdz456v; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289733; 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=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=OUW/rlnP2Uoe/3s6Eo31ge1+/ml9F7I9wPZ7oixMSVN9Ey6/iRZbGeF40Y/DnjPN6AQISF TvE/YQachXsU6V1tiMo2UJRgFRQt33wNH7KFu9/N49qg530c1bgaIHatlZ565ZNCJQETG1 WsfB4ua9DtLqM98tump/KLBEzphZbxuoRIIavasxDjUEJ2RjS4UQvEFNNhZ6IM/AzebIT7 K1iMl8e/1ezCA+SuFRlKSNYg9iWJVJ/pnZmXJ0hwHxanJhulkFkXmPBTumiTsgr5sQcJLu nSLmxjOyH07Td1hrEimgaAgGJRwhAeNH8BdZ4w5c8D34Mlbp7X0FEpMBx21ZIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289733; a=rsa-sha256; cv=none; b=tzleAfdtJMt9f8zLv0TKlHHqihaL+BO40E40FN4xe+C9k+QPmoHW8kj+QS/ab45M1g1TkS dn4hfEbAwq5Ad7g5lNMpYI4cJAGdF9mXkvcP984fBbn0B9NVk/n89urstRD51M0KIiPRzT 8eYXuyw2qS1NNZQq/3Gzj9uRyMkCB1FAWS7hOjA9d1Ec70cqtp0xWRv3Z2s4RvFkZB+mzf kYL6+z3Vxz+MLPv+Oe9cYYu9hfiOw3afXC+H/1iewkizRICjwBlJKaZDXPLhZqV5mqloyo NOH7dexpxGpZSbPQ+JwkXB0HsHLh1Bqfcq3+lXbA2KAZ3dOiv9XayUJk/ril+g== 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=1742289733; 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=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=lc+Q2WSZEydNqXAyCTrrLzV8nv4CntHPOlXh9FlQMEV2JRrVjz9JaZQAFmiEBZRRmlh1kD nOk9rmF3sPUEW1J8GzidBeDXtHDJwOY2LRlTLkdgWBublaEeLXj7tnp74GS1eCgJnN8vrq QA/WFncgP0fawlu/qKcYmBcXQs6y/+7TBRKxww5b8IyjBQrAUJmBjekZRDQJDvvuHSQsNr lH6ysMQ8UEdIpnajoE163v0HqHXyeeV6tN7SOsTg3f68eH2BOzhccCsxOjxPefLU98j8B+ HYX6p/XKVr6qUVCUV4utIiSxvpIC7TFShvTE0zGHJiKk2/Yd7ulmZGgaT+kCfA== 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 4ZH5vn0LSFzBrg; Tue, 18 Mar 2025 09:22:13 +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 52I9MCr0076219; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MCCJ076216; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:12 GMT Message-Id: <202503180922.52I9MCCJ076216@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: db8ceb8e5948 - main - net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() 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 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: db8ceb8e59487d1d6b2e019efab3eef40688731c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=db8ceb8e59487d1d6b2e019efab3eef40688731c commit db8ceb8e59487d1d6b2e019efab3eef40688731c Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:33:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:47 +0000 net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() Instead of passing -1 to the function in ieee80211_crypto_demic(), use the defined IEEE80211_KEYIX_NONE. net80211 uses ieee80211_keyix not u_int as type for the key index internally. Use that. This also helps when printing the -1 unsigned as it stays within the expected numerical scope and makes the debug message more readable. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49368 --- sys/net80211/ieee80211_crypto.c | 3 ++- sys/net80211/ieee80211_crypto.h | 2 +- sys/net80211/ieee80211_freebsd.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index daa2e0c1d6ec..b1c8b750e145 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -800,7 +800,8 @@ ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, * modules to handle a NULL key and not to dereference * it. */ - ieee80211_notify_michael_failure(vap, wh, -1); + ieee80211_notify_michael_failure(vap, wh, + IEEE80211_KEYIX_NONE); return (0); } diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index 5a365dd37aa3..a830d89c6dc8 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -273,6 +273,6 @@ void ieee80211_notify_replay_failure(struct ieee80211vap *, const struct ieee80211_frame *, const struct ieee80211_key *, uint64_t rsc, int tid); void ieee80211_notify_michael_failure(struct ieee80211vap *, - const struct ieee80211_frame *, u_int keyix); + const struct ieee80211_frame *, ieee80211_keyix keyix); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ #endif /* _NET80211_IEEE80211_CRYPTO_H_ */ diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index db118bc19d16..d3c8352ab411 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -870,7 +870,7 @@ ieee80211_notify_replay_failure(struct ieee80211vap *vap, void ieee80211_notify_michael_failure(struct ieee80211vap *vap, - const struct ieee80211_frame *wh, u_int keyix) + const struct ieee80211_frame *wh, ieee80211_keyix keyix) { struct ifnet *ifp = vap->iv_ifp;