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,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 4302EC2D0DB for ; Fri, 24 Jan 2020 11:01:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09B082075D for ; Fri, 24 Jan 2020 11:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579863668; bh=A/m/83iiO/OgDRj1Jf2CenkpxzHXvhOCBbjJyAM1yOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GANS6iCvUUf4x3UZPhYwS5vwey9nhmUVZXIre0vnA7z4+fQXgS+kEuFFxydCCRkXR ydcRpHje1JoWoBgWuY9bTx3uPdPdwCIz1BWh8DslLPmLlg3KLponK4J7E9AKXMlrqq F058FOgh+M4DsE08Hz5g/3WMUKoiIhhxgFlJ8Z7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387551AbgAXLBH (ORCPT ); Fri, 24 Jan 2020 06:01:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:33494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387515AbgAXLBD (ORCPT ); Fri, 24 Jan 2020 06:01:03 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 ECD5F2087E; Fri, 24 Jan 2020 11:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579863663; bh=A/m/83iiO/OgDRj1Jf2CenkpxzHXvhOCBbjJyAM1yOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kJ/psPuHV3Hmv4dfOp1zJu925YJLo4fpRBkukPIhOPEU5bUq39s5BdwTm9t2NVBTt WN0kwTQWgvQt6eGzs0mR0e7q1Cip/3Ae8g5BkZCEtNeO92PEq3bvReKPsJ+vXBSLqq bNtO89Kj5YsP/t6NGNQq1KRopfAUgWKF0E3ApibE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Sasha Levin Subject: [PATCH 4.19 041/639] cfg80211: regulatory: make initialization more robust Date: Fri, 24 Jan 2020 10:23:31 +0100 Message-Id: <20200124093052.593172030@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 71e5e886806ee3f8e0c44ed945eb2e4d6659c6e3 ] Since my change to split out the regulatory init to occur later, any issues during earlier cfg80211_init() or errors during the platform device allocation would lead to crashes later. Make this more robust by checking that the earlier initialization succeeded. Fixes: d7be102f2945 ("cfg80211: initialize regulatory keys/database later") Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 64841238df855..5643bdee7198f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -3870,6 +3870,15 @@ static int __init regulatory_init_db(void) { int err; + /* + * It's possible that - due to other bugs/issues - cfg80211 + * never called regulatory_init() below, or that it failed; + * in that case, don't try to do any further work here as + * it's doomed to lead to crashes. + */ + if (IS_ERR_OR_NULL(reg_pdev)) + return -EINVAL; + err = load_builtin_regdb_keys(); if (err) return err; -- 2.20.1