scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device()

[ Upstream commit fda34a5d304d0b98cc967e8763b52221b66dc202 ]

If hpsa_sas_port_add_rphy() returns an error, the 'rphy' allocated in
sas_end_device_alloc() needs to be freed. Address this by calling
sas_rphy_free() in the error path.

Fixes: d04e62b9d63a ("hpsa: add in sas transport class")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221111043012.1074466-1-yangyingliang@huawei.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 5e11500eae195dc8a5bde914378f9cb207da18cb..aa1e388e86f2f7836fec42dbb5fe0b1c5264fd97 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -9874,10 +9874,12 @@ static int hpsa_add_sas_device(struct hpsa_sas_node *hpsa_sas_node,
 
        rc = hpsa_sas_port_add_rphy(hpsa_sas_port, rphy);
        if (rc)
-               goto free_sas_port;
+               goto free_sas_rphy;
 
        return 0;
 
+free_sas_rphy:
+       sas_rphy_free(rphy);
 free_sas_port:
        hpsa_free_sas_port(hpsa_sas_port);
        device->sas_port = NULL;