lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 55/79] iwlwifi: actually check allocated conf_tlv pointer
    Date
    From: Chris Rorvick <chris@rorvick.com>

    [ Upstream commit a176e114ace4cca7df0e34b4bd90c301cdc6d653 ]

    Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating
    conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e
    ("iwlwifi: dbg: move debug data to a struct") but does not implement the
    check correctly.

    Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
    Tweeted-by: @grsecurity
    Signed-off-by: Chris Rorvick <chris@rorvick.com>
    Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20200417074558.12316-1-sedat.dilek@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    index 0481796f75bc4..c24350222133d 100644
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    @@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
    kmemdup(pieces->dbg_conf_tlv[i],
    pieces->dbg_conf_tlv_len[i],
    GFP_KERNEL);
    - if (!pieces->dbg_conf_tlv[i])
    + if (!drv->fw.dbg.conf_tlv[i])
    goto out_free_fw;
    }
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2022-09-17 16:07    [W:6.231 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site