lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 440/717] nfc: s3fwrn5: Release the nfc firmware
    Date
    From: Bongsu Jeon <bongsu.jeon@samsung.com>

    [ Upstream commit a4485baefa1efa596702ebffd5a9c760d42b14b5 ]

    add the code to release the nfc firmware when the firmware image size is
    wrong.

    Fixes: c04c674fadeb ("nfc: s3fwrn5: Add driver for Samsung S3FWRN5 NFC Chip")
    Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
    Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
    Link: https://lore.kernel.org/r/20201213095850.28169-1-bongsu.jeon@samsung.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nfc/s3fwrn5/firmware.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
    index ec930ee2c847e..64df50827642b 100644
    --- a/drivers/nfc/s3fwrn5/firmware.c
    +++ b/drivers/nfc/s3fwrn5/firmware.c
    @@ -293,8 +293,10 @@ static int s3fwrn5_fw_request_firmware(struct s3fwrn5_fw_info *fw_info)
    if (ret < 0)
    return ret;

    - if (fw->fw->size < S3FWRN5_FW_IMAGE_HEADER_SIZE)
    + if (fw->fw->size < S3FWRN5_FW_IMAGE_HEADER_SIZE) {
    + release_firmware(fw->fw);
    return -EINVAL;
    + }

    memcpy(fw->date, fw->fw->data + 0x00, 12);
    fw->date[12] = '\0';
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:4.185 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site