lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 635/700] scsi: mpt3sas: Fix error return value in _scsih_expander_add()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit d6c2ce435ffe23ef7f395ae76ec747414589db46 ]

    When an expander does not contain any 'phys', an appropriate error code -1
    should be returned, as done elsewhere in this function. However, we
    currently do not explicitly assign this error code to 'rc'. As a result, 0
    was incorrectly returned.

    Link: https://lore.kernel.org/r/20210514081300.6650-1-thunder.leizhen@huawei.com
    Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
    index ae1973878cc7..7824e77bc6e2 100644
    --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
    +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
    @@ -6883,8 +6883,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle)
    handle, parent_handle,
    (u64)sas_expander->sas_address, sas_expander->num_phys);

    - if (!sas_expander->num_phys)
    + if (!sas_expander->num_phys) {
    + rc = -1;
    goto out_fail;
    + }
    sas_expander->phy = kcalloc(sas_expander->num_phys,
    sizeof(struct _sas_phy), GFP_KERNEL);
    if (!sas_expander->phy) {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:09    [W:3.470 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site