From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 18 Mar 2024 16:53:17 +0000 (+0200)
Subject: wifi: ieee80211: check for NULL in ieee80211_mle_size_ok()
X-Git-Tag: v6.9.8~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1822443e8ff2a2ad9c089d9fb8ee9d54f3d5d538;p=thirdparty%2Fkernel%2Fstable.git

wifi: ieee80211: check for NULL in ieee80211_mle_size_ok()

[ Upstream commit b7793a1a2f370c28b17d9554b58e9dc51afcfcbd ]

For simplicity, we may want to pass a NULL element, and
while we should then pass also a zero length, just be a
bit more careful here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240318184907.4d983653cb8d.Ic3ea99b60c61ac2f7d38cb9fd202a03c97a05601@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index ac5be38d8aaf0..4fd9735bb75e5 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -5166,7 +5166,7 @@ static inline bool ieee80211_mle_size_ok(const u8 *data, size_t len)
 	bool check_common_len = false;
 	u16 control;
 
-	if (len < fixed)
+	if (!data || len < fixed)
 		return false;
 
 	control = le16_to_cpu(mle->control);