From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 1 Oct 2018 09:43:00 +0000 (+0200)
Subject: cfg80211: regulatory: make initialization more robust
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71e5e886806ee3f8e0c44ed945eb2e4d6659c6e3;p=linux.git

cfg80211: regulatory: make initialization more robust

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 <johannes.berg@intel.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 56be68a27bb96..d7b93a772edc6 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -3829,6 +3829,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;