Date: Fri, 8 Oct 2021 11:25:33 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0525ece3554e - main - net80211: fix build for 526370fb85db4b659cff4625eb2f379acaa4a1a8 Message-ID: <202110081125.198BPXDN026388@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0525ece3554edce14fa68a7fb61078ae2110c44b commit 0525ece3554edce14fa68a7fb61078ae2110c44b Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2021-10-08 11:21:44 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2021-10-08 11:21:44 +0000 net80211: fix build for 526370fb85db4b659cff4625eb2f379acaa4a1a8 In 526370fb85db4b659cff4625eb2f379acaa4a1a8 "net80211: proper ssid length check in setmlme_assoc_adhoc()" we are checking the sizeof on an array function parameter which leads to a warning that it will resturn the size of the type of the array rather than the array size itself. Use the defined length used both in the ioctl and the sizing of the array function parameter instead. Reported by: CI MFC after: 3 days X-MFC with: 526370fb85db4b659cff4625eb2f379acaa4a1a8 --- sys/net80211/ieee80211_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index b0339d996999..419518eb1224 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1591,7 +1591,7 @@ setmlme_assoc_adhoc(struct ieee80211vap *vap, ("expected opmode IBSS or AHDEMO not %s", ieee80211_opmode_name[vap->iv_opmode])); - if (ssid_len == 0 || ssid_len > sizeof(ssid)) + if (ssid_len == 0 || ssid_len > IEEE80211_NWID_LEN) return EINVAL; sr = IEEE80211_MALLOC(sizeof(*sr), M_TEMP,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110081125.198BPXDN026388>