lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 238/334] rsi: fix error code in rsi_load_9116_firmware()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit d0f8430332a16c7baa80ce2886339182c5d85f37 ]

    This code returns success if the kmemdup() fails, but obviously it
    should return -ENOMEM instead.

    Fixes: e5a1ecc97e5f ("rsi: add firmware loading for 9116 device")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210805103746.GA26417@kili
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/rsi/rsi_91x_hal.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
    index 99b21a2c8386..f4a26f16f00f 100644
    --- a/drivers/net/wireless/rsi/rsi_91x_hal.c
    +++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
    @@ -1038,8 +1038,10 @@ static int rsi_load_9116_firmware(struct rsi_hw *adapter)
    }

    ta_firmware = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
    - if (!ta_firmware)
    + if (!ta_firmware) {
    + status = -ENOMEM;
    goto fail_release_fw;
    + }
    fw_p = ta_firmware;
    instructions_sz = fw_entry->size;
    rsi_dbg(INFO_ZONE, "FW Length = %d bytes\n", instructions_sz);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:45    [W:4.056 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site