From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A220C43461 for ; Mon, 7 Sep 2020 17:00:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0A4F21532 for ; Mon, 7 Sep 2020 17:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599498039; bh=7wc3gCb9H27E8WGzWkxyA39CKqC2wPm7ch/z3ys5BrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aJWbbcQFIoTh8McyXCWHQQJTJ/XhNm77sxvu72PQ4aqsS5vJ7w+LVPay81NERAd9s xQlpPsveJvgRU8TUrvCIfpNeXRF+27t2LFzHSEy+Urg1DBCNh4deZACFMIqkGtgBb5 QHGmA616aQtlOpIAvSv0hMZSJaOUGcOD6+hgrAfw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731245AbgIGQ7N (ORCPT ); Mon, 7 Sep 2020 12:59:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:47712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730736AbgIGQdx (ORCPT ); Mon, 7 Sep 2020 12:33:53 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD0F121789; Mon, 7 Sep 2020 16:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599496429; bh=7wc3gCb9H27E8WGzWkxyA39CKqC2wPm7ch/z3ys5BrQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lrLccKd5l99DYM9s7EK1TAjrvozMuxjKnCbxE2INgPlm58N8y29cdrz/oFTqm+Eh2 oP3DpgFjDHwgNlatkRAlKZ21aRRPpnKEewAVG4vQHzr1NZM2INGfv/QwK5OEpzuhbc E56DCboOKeBusEHmqTeHfW/02WgHFfaA+khNMVoE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , syzbot+d451401ffd00a60677ee@syzkaller.appspotmail.com, Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/43] cfg80211: regulatory: reject invalid hints Date: Mon, 7 Sep 2020 12:33:01 -0400 Message-Id: <20200907163329.1280888-15-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200907163329.1280888-1-sashal@kernel.org> References: <20200907163329.1280888-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 47caf685a6854593348f216e0b489b71c10cbe03 ] 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: Sasha Levin --- net/wireless/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 1a8218f1bbe07..20a8e6af88c45 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2941,6 +2941,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; -- 2.25.1