From patchwork Mon May 7 14:11:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen-chien Jesse Sung X-Patchwork-Id: 909767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40fl1W5Q8Fz9s47; Tue, 8 May 2018 00:12:15 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fFgs6-0005YX-R2; Mon, 07 May 2018 14:12:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fFgs5-0005YD-9R for kernel-team@lists.ubuntu.com; Mon, 07 May 2018 14:12:09 +0000 Received: from 123-204-41-50.static.seed.net.tw ([123.204.41.50] helo=cola.voip.idv.tw) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fFgs4-0007AS-Gw; Mon, 07 May 2018 14:12:09 +0000 From: Wen-chien Jesse Sung To: kernel-team@lists.ubuntu.com Subject: [Xenial][PATCH v2 1/3] Revert "UBUNTU: SAUCE: mwifiex: do not dereference invalid pointer" Date: Mon, 7 May 2018 22:11:58 +0800 Message-Id: <20180507141200.25957-2-jesse.sung@canonical.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180507141200.25957-1-jesse.sung@canonical.com> References: <20180507141200.25957-1-jesse.sung@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://launchpad.net/bugs/1769671 This reverts the workaround commit 8a034f97a28dba62026343eef7992766c91273a7 for integrating the fix. Signed-off-by: Wen-chien Jesse Sung --- drivers/net/wireless/mwifiex/cfp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index 47eb72546272..09fae27140f7 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c @@ -324,9 +324,7 @@ mwifiex_get_cfp(struct mwifiex_private *priv, u8 band, u16 channel, u32 freq) if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG) sband = priv->wdev.wiphy->bands[IEEE80211_BAND_2GHZ]; else - sband = priv->wdev.wiphy ? - priv->wdev.wiphy->bands[IEEE80211_BAND_5GHZ] : - NULL; + sband = priv->wdev.wiphy->bands[IEEE80211_BAND_5GHZ]; if (!sband) { mwifiex_dbg(priv->adapter, ERROR,