From nobody Wed Dec 7 20:34:13 2022 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 4NS8C96JfXz4jmNs; Wed, 7 Dec 2022 20:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NS8C95llKz3j4W; Wed, 7 Dec 2022 20:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670445253; 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=1ZQ2vOGeH/cg5uvkHbXFY+zvwYA6FI4uqlCoHWMyDJo=; b=GNNgidAg3E/UHt231pU4byP8lC91B3bdVGBDTPZT8UrXFFdwwImEDBFDd5P8/yI/AE0VOQ M8TvqEEJA6rrkTzDrvWDUxP2HvPuVU2Jd6/bAur/tbtnPAy8SejBTu+pYoJzyKJZFppQaY 9qkN44rEeR9QpPDzxwgOk1A34dyirlHNFtO5KnjXjtfne4K6omTFDkKV71B8Z8bATy+Gq8 CCvSVkMfSPmPoTyhkvbrQE0l8Z64sSwI3EeNCwJYw5aqEYUCMG8R6CeD5nJRaYztVbUHDs UDhQHnaR+25HhsSZ8vrC8z3Pd6T7ynxgcaLbRrl5/ut37/RTTglYS311jPKTjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670445253; 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=1ZQ2vOGeH/cg5uvkHbXFY+zvwYA6FI4uqlCoHWMyDJo=; b=THNC0X2tD/bL7+SOZGhpoVJWfdIXcPQ8ZCdReMt7VFpCs7kGqnLa/0s8ajZnjenaTfA+1P sGfc6Chi5tJDJj2boIanGFKaXC6k8j3BqvkJccDwQuoWg6txrQjvjLeaD9RYvFNoPqCToz V0X5lvorF4vjuwf1w+sk/Ru5H+yVrPFcQqaiF7e9py/5K8k8ZfxdYCaYRylUt02W5k+iT5 jH3zrmWreoUyQ20SKpGrAM5s+yZT3cTyYFuejIzq1Jgl9ngulBHKCTg9WGVkGMk+fL3su1 5Ce2reZBKWmeFMyhGqmIYH2iaAOoh3Wry1CaNXD2wBpQ0TOm6wq3eWXqXcLNBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670445253; a=rsa-sha256; cv=none; b=XW0WFsaHitarEyRrSvZry5XZIRj1HhwhphmMzI1H7+Z8qVutdqBD5ZsmDPQg0IO5G5f1cv X/5d5OSOe/GMdhUJGuMycEW4OQpStnIRfmdm/bTl132886Ijw5DVQPac+32S7gFRRFcEH9 gWJTqWQ0SZunvfyE1EZwf1a438XdzLSh3qgDLAIl4AVMF0SPKysnBXfT5WFcrIRDLXDwXt 7TBTts/kVH4cHeOrUuCtT+O92zwLrQfiRMTHxsfUDjtzA1Fr2AYkb/7FOAZDxdJDsujm50 VOktzlG860xDiH3SWDuV0VKyybN2wXRLkhInphmODfwasJ6XpXFnQICJcFqSVQ== 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 4NS8C94YpFzVbl; Wed, 7 Dec 2022 20:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B7KYDR7088633; Wed, 7 Dec 2022 20:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7KYDCs088632; Wed, 7 Dec 2022 20:34:13 GMT (envelope-from git) Date: Wed, 7 Dec 2022 20:34:13 GMT Message-Id: <202212072034.2B7KYDCs088632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1f0781209559 - main - net80211: Fix mismatches in array bounds. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f078120955947c85c54a8c088782ea5e4451eb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1f078120955947c85c54a8c088782ea5e4451eb5 commit 1f078120955947c85c54a8c088782ea5e4451eb5 Author: John Baldwin AuthorDate: 2022-12-07 20:31:53 +0000 Commit: John Baldwin CommitDate: 2022-12-07 20:31:53 +0000 net80211: Fix mismatches in array bounds. Reported by: GCC -Warray-parameter Reviewed by: imp, emaste (earlier version) Differential Revision: https://reviews.freebsd.org/D37546 --- sys/net80211/ieee80211_node.h | 2 +- sys/net80211/ieee80211_proto.h | 4 ++-- sys/net80211/ieee80211_scan.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 2d237c3d597f..d9ac5b504e7f 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -436,7 +436,7 @@ struct ieee80211_node *_ieee80211_find_rxnode_withkey( const struct ieee80211_frame_min *, uint16_t keyix, const char *func, int line); struct ieee80211_node *_ieee80211_find_txnode(struct ieee80211vap *, - const uint8_t *, + const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line); #define ieee80211_free_node(ni) \ _ieee80211_free_node(ni, __func__, __LINE__) diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h index 4b324caa694b..e9b5157716d4 100644 --- a/sys/net80211/ieee80211_proto.h +++ b/sys/net80211/ieee80211_proto.h @@ -459,8 +459,8 @@ void ieee80211_notify_cac(struct ieee80211com *, enum ieee80211_notify_cac_event); void ieee80211_notify_node_deauth(struct ieee80211_node *); void ieee80211_notify_node_auth(struct ieee80211_node *); -void ieee80211_notify_country(struct ieee80211vap *, const uint8_t [], - const uint8_t cc[2]); +void ieee80211_notify_country(struct ieee80211vap *, + const uint8_t [IEEE80211_ADDR_LEN], const uint8_t cc[2]); void ieee80211_notify_radio(struct ieee80211com *, int); void ieee80211_notify_ifnet_change(struct ieee80211vap *); #endif /* _NET80211_IEEE80211_PROTO_H_ */ diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index 1e07aacfc201..50b3151063fa 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -607,7 +607,8 @@ ieee80211_scan_timeout(struct ieee80211com *ic) * Mark a scan cache entry after a successful associate. */ void -ieee80211_scan_assoc_success(struct ieee80211vap *vap, const uint8_t mac[]) +ieee80211_scan_assoc_success(struct ieee80211vap *vap, + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct ieee80211_scan_state *ss = vap->iv_ic->ic_scan; @@ -623,7 +624,7 @@ ieee80211_scan_assoc_success(struct ieee80211vap *vap, const uint8_t mac[]) */ void ieee80211_scan_assoc_fail(struct ieee80211vap *vap, - const uint8_t mac[], int reason) + const uint8_t mac[IEEE80211_ADDR_LEN], int reason) { struct ieee80211_scan_state *ss = vap->iv_ic->ic_scan;