]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: ieee80211: check for NULL in ieee80211_mle_size_ok()
authorJohannes Berg <johannes.berg@intel.com>
Mon, 18 Mar 2024 16:53:17 +0000 (18:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jul 2024 07:37:58 +0000 (09:37 +0200)
[ 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>
include/linux/ieee80211.h

index ac5be38d8aaf00d0660983e8a6db68ddc17320f9..4fd9735bb75e50117f1895095f0f0da20448b783 100644 (file)
@@ -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);