lkml.org 
[lkml]   [2020]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 057/108] rsi: fix null pointer dereference during rsi_shutdown()
    Date
    From: Martin Kepplinger <martin.kepplinger@puri.sm>

    [ Upstream commit 16bbc3eb83728c03138191a5d23d84d38175fa26 ]

    Appearently the hw pointer can be NULL while the module is loaded and
    in that case rsi_shutdown() crashes due to the unconditional dereference.

    Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/rsi/rsi_91x_sdio.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
    index 1bebba4e85273..5d6143a551877 100644
    --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
    +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
    @@ -1468,12 +1468,15 @@ static void rsi_shutdown(struct device *dev)
    struct rsi_91x_sdiodev *sdev =
    (struct rsi_91x_sdiodev *)adapter->rsi_dev;
    struct ieee80211_hw *hw = adapter->hw;
    - struct cfg80211_wowlan *wowlan = hw->wiphy->wowlan_config;

    rsi_dbg(ERR_ZONE, "SDIO Bus shutdown =====>\n");

    - if (rsi_config_wowlan(adapter, wowlan))
    - rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n");
    + if (hw) {
    + struct cfg80211_wowlan *wowlan = hw->wiphy->wowlan_config;
    +
    + if (rsi_config_wowlan(adapter, wowlan))
    + rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n");
    + }

    if (IS_ENABLED(CONFIG_RSI_COEX) && adapter->priv->coex_mode > 1 &&
    adapter->priv->bt_adapter) {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-12 01:30    [W:4.246 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site