cfg80211: check reg_rule for NULL in handle_channel_custom()

jmberg-intel · gregkh · commit c0d470e3ec3b · 2020-03-20T09:07:57.000+01:00
[ Upstream commit a7ee7d4 ] 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 <johannes.berg@intel.com> Link: https://lore.kernel.org/r/20200221104449.3b558a50201c.I4ad3725c4dacaefd2d18d3cc65ba6d18acd5dbfe@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1730,7 +1730,7 @@ static void handle_channel_custom(struct wiphy *wiphy,`
`1730`	`1730`	`break;`
`1731`	`1731`	`}`
`1732`	`1732`
`1733`		`- if (IS_ERR(reg_rule)) {`
	`1733`	`+ if (IS_ERR_OR_NULL(reg_rule)) {`
`1734`	`1734`	`pr_debug("Disabling freq %d MHz as custom regd has no rule that fits it\n",`
`1735`	`1735`	`chan->center_freq);`
`1736`	`1736`	`if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) {`