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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 453D1C43332 for ; Thu, 19 Mar 2020 13:29:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 143E9207FC for ; Thu, 19 Mar 2020 13:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624541; bh=iUS63HzURkdNWPqhwTnoxFpkn4beUpwEPN/ZA6lYULI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BgqO5UYNwqlJr6o9QZd4y5qc/oCmFuV6/tlVUcZJgXKTQq82o6qOSlD2wrOOvuZBP QuMYIcoi1dH4IWKkL90u6Q5Geio8EZJx0c6FBeO852UfSBag3+hxPmSmeAYKWkKsfh p4HmSDM69RVTtTo7THVKwPI3E8ZkVLgLTEXLXvcM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730629AbgCSNZ3 (ORCPT ); Thu, 19 Mar 2020 09:25:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:53058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730626AbgCSNZ2 (ORCPT ); Thu, 19 Mar 2020 09:25:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E61CA208D6; Thu, 19 Mar 2020 13:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624328; bh=iUS63HzURkdNWPqhwTnoxFpkn4beUpwEPN/ZA6lYULI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2aokacV097h9yXuwxN8Xz09PtUSjmilIkmGOfvSUNAJzcldy2yXYF9Eo7dFkjudaw uuQxAGSUMw2rlojEMWiPZey7Fwsaz3v707xtk/25BLmSjjIm9+PFL+BMih6Nh8e0cp I1dF6u5lCdLgjs0UnSZkfoGymH+8tiDBmIV+bA00= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Sasha Levin Subject: [PATCH 5.5 24/65] cfg80211: check reg_rule for NULL in handle_channel_custom() Date: Thu, 19 Mar 2020 14:04:06 +0100 Message-Id: <20200319123934.021795100@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123926.466988514@linuxfoundation.org> References: <20200319123926.466988514@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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 fff9a74891fc4..1a8218f1bbe07 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2276,7 +2276,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