scsi: hpsa: Fix error handling in hpsa_add_sas_host()
authorYang Yingliang <yangyingliang@huawei.com>
Thu, 10 Nov 2022 15:11:29 +0000 (23:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:14:24 +0000 (13:14 +0100)
[ Upstream commit 4ef174a3ad9b5d73c1b6573e244ebba2b0d86eac ]

hpsa_sas_port_add_phy() does:
  ...
  sas_phy_add()  -> may return error here
  sas_port_add_phy()
  ...

Whereas hpsa_free_sas_phy() does:
  ...
  sas_port_delete_phy()
  sas_phy_delete()
  ...

If hpsa_sas_port_add_phy() returns an error, hpsa_free_sas_phy() can not be
called to free the memory because the port and the phy have not been added
yet.

Replace hpsa_free_sas_phy() with sas_phy_free() and kfree() to avoid kernel
crash in this case.

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

index 74d5639..a4a0094 100644 (file)
@@ -9788,7 +9788,8 @@ static int hpsa_add_sas_host(struct ctlr_info *h)
        return 0;
 
 free_sas_phy:
-       hpsa_free_sas_phy(hpsa_sas_phy);
+       sas_phy_free(hpsa_sas_phy->phy);
+       kfree(hpsa_sas_phy);
 free_sas_port:
        hpsa_free_sas_port(hpsa_sas_port);
 free_sas_node: