Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3db36572 authored by Zhen Lei's avatar Zhen Lei Committed by Greg Kroah-Hartman
Browse files

scsi: mpt3sas: Fix error return value in _scsih_expander_add() 

[ 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: f92363d1 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f457e80c

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+3 −1
Original line number Diff line number Diff line
@@ -5199,8 +5199,10 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 
	    handle, parent_handle, (unsigned long long)

	    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) {