From nobody Fri Apr 18 14:37:01 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 4ZfHQk0SvNz5stR1; Fri, 18 Apr 2025 14:37:02 +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 4ZfHQj2sF4z3KQX; Fri, 18 Apr 2025 14:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987021; 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=jQD4nRA4BGlnNE5qwz+20AgGhONJTHeiVsim+1UdfOk=; b=mLi6xs5so+ARVTWre/ZMZKHQMG/8dynXU1/gLLKA56bsAnJMy9+UeGqkUH+rLkwWOQ8CmB X7TaEzXxDRDAFoIZTv5VOgY4BrB+KQ7QXC0LPWtZtIXr8tXIJd0XcE305CFDfUort6uwr3 MazlchiIv94dNbMKXrVpBbKvc7/bl9DIISWfF6Bsy7/uTie5e9asDxkKjltLYhM3Gj/+qX QU2ZeZP/80ABICu7b6ZUl1IjQjtXQivn1JhH1SBriEnmEcpzmAqE7n0RVB+5n0e/vn/zJo gV58eAt/POxH7BBpII8tpQqFTwOIicQe1GUIf/clJBc/qeuN9Kp8xkMObGZWlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987021; a=rsa-sha256; cv=none; b=jp7//p20ILWE/e3KFNfJB3DiPCkF29ghkLHT5NKR29K+Dhc7/LUHFPHgHfVdRD8+qaoYGE PfmWkswRuAamUjl1zO+lOW4Py3GVOyK9pXtfVxXR0HghjvbCdAh6d3J1WxktxCscmXWRxT zQN991TnS00uIy7uOX/EuX3COlRtSAcu9v/BPX44jt8BHWcZJ+l1D81GTfHqeNhgxxYO0L tKqZjrkqrkjhbJaXb/fFhpkp/pMOWpCldJtRnEV9RJpomaPHDCUOaI/i8zmMDst7nOXYin 6JaRSO1ODbf1cqF72qAjsMPq9iUv8QgB0kTHSZu0ZCfkL1ZUEpyLgjKkwr9uog== 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=1744987021; 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=jQD4nRA4BGlnNE5qwz+20AgGhONJTHeiVsim+1UdfOk=; b=hDQtmTMjwn8sJahD9mIxlPsT5OQVJjvs690R26QaiGO9vEE9Lj87Y8lln/Kq3ko78DUl9A 841m2qcJfpwJCxkCBu/VEwV+UA4uHRbDukXJpJMnTzQsZF9dUGZHBy/2XDkhmfZ6t/ZcBC AIBrgNA+YBqlyVRwmVNBYwP2fy0wNvHLtCPdcYetp8qg+fbc0EI8pmFxNAXZw+NlhLpbhP 7BPKIDjga8OSxMdcwa/x0hR1/Q1M5tXwWwYxxLT/H63tSb6/X6wTW+Nw4EW903/o/RrP7w eY6AVnBi3oFV8rgW4JXx3gMqE57LesoPmOlUMvDe/Ulfco4o/OdIv+xHDIUQSA== 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 4ZfHQj22QXzfDx; Fri, 18 Apr 2025 14:37:01 +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 53IEb1Lf091426; Fri, 18 Apr 2025 14:37:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb1FS091423; Fri, 18 Apr 2025 14:37:01 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:01 GMT Message-Id: <202504181437.53IEb1FS091423@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: 8f564898b937 - stable/14 - net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() 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: 8f564898b937555273d6a8da107168ce16c7db99 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f564898b937555273d6a8da107168ce16c7db99 commit 8f564898b937555273d6a8da107168ce16c7db99 Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:33:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:58 +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 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49368 (cherry picked from commit db8ceb8e59487d1d6b2e019efab3eef40688731c) --- 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 c5e0816bd43c..45316b43605a 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -725,7 +725,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 156d5d77fd55..49e3f93410b2 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -249,6 +249,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;