[Xenial][PATCH v2 2/3] Revert "UBUNTU: SAUCE: net/wireless: do not dereference invalid pointer"

Wen-chien Jesse Sung jesse.sung at canonical.com
Mon May 7 14:11:59 UTC 2018


BugLink: https://launchpad.net/bugs/1769671

This reverts the workaround commit f21d12781c88413aec7ee44983f05b1cdf90662f
for integrating the fix.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 net/wireless/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index e358511f1120..baf7218cec15 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -121,7 +121,7 @@ struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
 	int i;
 
 	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
-		sband = wiphy ? wiphy->bands[band] : NULL;
+		sband = wiphy->bands[band];
 
 		if (!sband)
 			continue;
-- 
2.17.0





More information about the kernel-team mailing list