lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 209/639] staging: r8822be: check kzalloc return or bail
    Date
    From: Nicholas Mc Guire <hofrat@osadl.org>

    [ Upstream commit e4b08e16b7d9d030b6475ef48f94d734a39f3c81 ]

    The kzalloc() in halmac_parse_psd_data_88xx() can fail and return NULL
    so check the psd_set->data after allocation and if allocation failed
    return HALMAC_CMD_PROCESS_ERROR.

    Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
    Fixes: 938a0447f094 ("staging: r8822be: Add code for halmac sub-drive")
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    index 53f55f129a760..ec742da030dba 100644
    --- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    +++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    @@ -2466,8 +2466,11 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,
    segment_size = (u8)PSD_DATA_GET_SEGMENT_SIZE(c2h_buf);
    psd_set->data_size = total_size;

    - if (!psd_set->data)
    + if (!psd_set->data) {
    psd_set->data = kzalloc(psd_set->data_size, GFP_KERNEL);
    + if (!psd_set->data)
    + return HALMAC_CMD_PROCESS_ERROR;
    + }

    if (segment_id == 0)
    psd_set->segment_size = segment_size;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:11    [W:4.023 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site