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=ham 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 C0CE0C2BB84 for ; Mon, 7 Sep 2020 16:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 845E621532 for ; Mon, 7 Sep 2020 16:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599497590; bh=DAVwLkQ4v01Y+Q48aCjKXFzsECg7LZtHmk0hBPyG06c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qohqZVIC+3Vd3Zo9hSErohd1CammftS9fP0jXtpOrzEK5P4AfGt1Q1DQ3xvv2kp8L KyywmvODDfKH2rHRhalDIwWG9UtPUVR1sD/uHRB9WVGwlCNg+Gfb8EXzYvxrhn4m6V PK0U0zEI9+3CPp5olOaB5jiSVMTwbdq/l0QBkh1w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730839AbgIGQxJ (ORCPT ); Mon, 7 Sep 2020 12:53:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730763AbgIGQek (ORCPT ); Mon, 7 Sep 2020 12:34:40 -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 518D721D80; Mon, 7 Sep 2020 16:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599496478; bh=DAVwLkQ4v01Y+Q48aCjKXFzsECg7LZtHmk0hBPyG06c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJP0AQx2i9nlMVqnPQbXN2VwQvwYGQvO3WYYk5iQaEQyYXlkj9+cRs+h4ZuSKnPYk RjKbcB4zh/caNkdFuDMiZF97UVzVI9JRv58nEhEQP0Af4douch77CnYJeLLCbS0w/K MHStzwPiSfMVVB2xSw8TEvARUjT9gmncnHyZOMMk= 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 4.19 09/26] cfg80211: regulatory: reject invalid hints Date: Mon, 7 Sep 2020 12:34:09 -0400 Message-Id: <20200907163426.1281284-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200907163426.1281284-1-sashal@kernel.org> References: <20200907163426.1281284-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 32f575857e415..935aebf150107 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2936,6 +2936,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