lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 52/59] scsi: mpt3sas: Fix error return code of mpt3sas_base_attach()
    Date
    From: Jia-Ju Bai <baijiaju1990@gmail.com>

    [ Upstream commit 3401ecf7fc1b9458a19d42c0e26a228f18ac7dda ]

    When kzalloc() returns NULL, no error return code of mpt3sas_base_attach()
    is assigned. To fix this bug, r is assigned with -ENOMEM in this case.

    Link: https://lore.kernel.org/r/20210308035241.3288-1-baijiaju1990@gmail.com
    Fixes: c696f7b83ede ("scsi: mpt3sas: Implement device_remove_in_progress check in IOCTL path")
    Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
    Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/mpt3sas/mpt3sas_base.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
    index 20bf1fa7f273..9e400def0d04 100644
    --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
    +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
    @@ -5455,14 +5455,18 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
    ioc->pend_os_device_add_sz++;
    ioc->pend_os_device_add = kzalloc(ioc->pend_os_device_add_sz,
    GFP_KERNEL);
    - if (!ioc->pend_os_device_add)
    + if (!ioc->pend_os_device_add) {
    + r = -ENOMEM;
    goto out_free_resources;
    + }

    ioc->device_remove_in_progress_sz = ioc->pend_os_device_add_sz;
    ioc->device_remove_in_progress =
    kzalloc(ioc->device_remove_in_progress_sz, GFP_KERNEL);
    - if (!ioc->device_remove_in_progress)
    + if (!ioc->device_remove_in_progress) {
    + r = -ENOMEM;
    goto out_free_resources;
    + }

    ioc->fwfault_debug = mpt3sas_fwfault_debug;

    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-29 10:11    [W:4.089 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site