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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 D2582C3F2D1 for ; Thu, 5 Mar 2020 17:16:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AB2720848 for ; Thu, 5 Mar 2020 17:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428619; bh=L0JnuaTB60PR88JIXOZ7LLqFNSyYGED8y7o/iOHkEWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AhOa7LAISKG12La2Doij9PmBHWUCIeDVvKwoCs6EHYRqT+s89VUJ2o4YbPsaWrtqH +ZowDXjTcN+Av61uFFIQteh91g0IC77f4MmqdJr7d5KFHkIff1WOJ787Th+8rLGZX3 zMb6aewhbgnLLOXLPQsbpS8YvwOEutJWoACKxXeM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728396AbgCERQJ (ORCPT ); Thu, 5 Mar 2020 12:16:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:43150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728373AbgCERQI (ORCPT ); Thu, 5 Mar 2020 12:16:08 -0500 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 A6A0A21556; Thu, 5 Mar 2020 17:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428568; bh=L0JnuaTB60PR88JIXOZ7LLqFNSyYGED8y7o/iOHkEWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GewPzAc3HuoN45IWKMeC19ARfGoC2z/2ATpsi2a7bLvMgBA1cGYcm8hzCUkmK4ODY VvF5FYCWSKUo/Uz/ws9/Q5OzMQr/NA9KThiLXYp51979kZfDVPde8jNIXYtCS7T6D7 uEcvwee3DC8GQ72jGKoB/G8R6AIdNfAHttgAp3Ho= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 07/12] cfg80211: check reg_rule for NULL in handle_channel_custom() Date: Thu, 5 Mar 2020 12:15:54 -0500 Message-Id: <20200305171559.30422-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171559.30422-1-sashal@kernel.org> References: <20200305171559.30422-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Johannes Berg [ Upstream commit a7ee7d44b57c9ae174088e53a668852b7f4f452d ] We may end up with a NULL reg_rule after the loop in handle_channel_custom() if the bandwidth didn't fit, check if this is the case and bail out if so. Signed-off-by: Johannes Berg Link: https://lore.kernel.org/r/20200221104449.3b558a50201c.I4ad3725c4dacaefd2d18d3cc65ba6d18acd5dbfe@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 0e66768427ba7..6d5f3f737207d 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1730,7 +1730,7 @@ static void handle_channel_custom(struct wiphy *wiphy, break; } - if (IS_ERR(reg_rule)) { + if (IS_ERR_OR_NULL(reg_rule)) { pr_debug("Disabling freq %d MHz as custom regd has no rule that fits it\n", chan->center_freq); if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) { -- 2.20.1