From: Johannes Berg Date: Wed, 19 Aug 2020 08:46:48 +0000 (+0200) Subject: cfg80211: regulatory: reject invalid hints X-Git-Tag: v5.8.8~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=548c1175051d986132046080e94b058c41e469f0;p=thirdparty%2Fkernel%2Fstable.git cfg80211: regulatory: reject invalid hints commit 47caf685a6854593348f216e0b489b71c10cbe03 upstream. Reject invalid hints early in order to not cause a kernel WARN later if they're restored to or similar. Reported-by: syzbot+d451401ffd00a60677ee@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?extid=d451401ffd00a60677ee Link: https://lore.kernel.org/r/20200819084648.13956-1-johannes@sipsolutions.net Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 0d74a31ef0ab4..fc2af2c8b6d54 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2944,6 +2944,9 @@ int regulatory_hint_user(const char *alpha2, if (WARN_ON(!alpha2)) return -EINVAL; + if (!is_world_regdom(alpha2) && !is_an_alpha2(alpha2)) + return -EINVAL; + request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL); if (!request) return -ENOMEM;