From: Triet Hoang <triet.hoang.dev@gmail.com>
To: sathya.prakash@broadcom.com
Cc: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com,
sreekanth.reddy@broadcom.com,
James.Bottomley@HansenPartnership.com,
martin.petersen@oracle.com, mpi3mr-linuxdrv.pdl@broadcom.com,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Triet Hoang <triet.hoang.dev@gmail.com>
Subject: [PATCH] scsi: mpi3mr: Handle SAS port and rphy allocation failures
Date: Mon, 17 Aug 2026 12:26:19 +0700 [thread overview]
Message-ID: <20260817052619.810762-1-triet.hoang.dev@gmail.com> (raw)
Check the return value of sas_port_alloc_num() and handle failures
before attempting to add the port.
Free the SAS port if sas_port_add() fails. Also handle failures from
sas_end_device_alloc() and sas_expander_alloc() by removing the PHYs
from the port, deleting the SAS port, and returning failure.
This prevents NULL pointer dereferences and ensures resources allocated
during SAS port creation are properly cleaned up on error paths.
Signed-off-by: Triet Hoang <triet.hoang.dev@gmail.com>
---
drivers/scsi/mpi3mr/mpi3mr_transport.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/scsi/mpi3mr/mpi3mr_transport.c b/drivers/scsi/mpi3mr/mpi3mr_transport.c
index 240f67a8e2e3..2fbfd178c539 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@ -1428,9 +1428,17 @@ static struct mpi3mr_sas_port *mpi3mr_sas_port_add(struct mpi3mr_ioc *mrioc,
}
port = sas_port_alloc_num(mr_sas_node->parent_dev);
+ if (!port) {
+ ioc_err(mrioc, "failure at %s:%d/%s()!\n",
+ __FILE__, __LINE__, __func__);
+ goto out_fail;
+ }
+
if ((sas_port_add(port))) {
ioc_err(mrioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
+ sas_port_free(port);
+ port = NULL;
goto out_fail;
}
@@ -1455,6 +1463,19 @@ static struct mpi3mr_sas_port *mpi3mr_sas_port_add(struct mpi3mr_ioc *mrioc,
rphy = sas_expander_alloc(port,
mr_sas_port->remote_identify.device_type);
}
+
+ if (!rphy) {
+ ioc_err(mrioc, "failure at %s:%d/%s()!\n",
+ __FILE__, __LINE__, __func__);
+ list_for_each_entry(mr_sas_phy, &mr_sas_port->phy_list, port_siblings) {
+ mr_sas_phy->phy_belongs_to_port = 0;
+ mr_sas_phy->hba_port = NULL;
+ sas_port_delete_phy(port, mr_sas_phy->phy);
+ }
+ sas_port_delete(port);
+ goto out_fail;
+ }
+
rphy->identify = mr_sas_port->remote_identify;
if (mrioc->current_event)
--
2.53.0
next reply other threads:[~2026-08-17 5:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 5:26 Triet Hoang [this message]
2026-08-17 5:36 ` [PATCH] scsi: mpi3mr: Handle SAS port and rphy allocation failures sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260817052619.810762-1-triet.hoang.dev@gmail.com \
--to=triet.hoang.dev@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mpi3mr-linuxdrv.pdl@broadcom.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=sumit.saxena@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox