From: Salah Triki <salah.triki@gmail.com>
To: Adaptec OEM Raid Solutions <aacraid@microsemi.com>,
"James E.J. Bottomley" <James.Bottomley@hansenpartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: salah.triki@gmail.com
Subject: [PATCH] scsi: ips: Quit ips_flush_and_reset() if dma allocation fails
Date: Thu, 24 Jul 2025 00:54:46 +0100 [thread overview]
Message-ID: <aIF2RrQZpJora09i@pc> (raw)
dma_free_coherent() and (*ha->func.reset) need to be called only when
dma_alloc_coherent() succeed. So, if it fails, exit ips_flush_and_reset().
Signed-off-by: Salah Triki <salah.triki@gmail.com>
Tested-by: Compile only
---
drivers/scsi/ips.c | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 94adb6ac02a4..e51bfb797aa5 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -4545,26 +4545,28 @@ ips_flush_and_reset(ips_ha_t *ha)
/* Create a usuable SCB */
scb = dma_alloc_coherent(&ha->pcidev->dev, sizeof(ips_scb_t),
&command_dma, GFP_KERNEL);
- if (scb) {
- memset(scb, 0, sizeof(ips_scb_t));
- ips_init_scb(ha, scb);
- scb->scb_busaddr = command_dma;
-
- scb->timeout = ips_cmd_timeout;
- scb->cdb[0] = IPS_CMD_FLUSH;
-
- scb->cmd.flush_cache.op_code = IPS_CMD_FLUSH;
- scb->cmd.flush_cache.command_id = IPS_MAX_CMDS; /* Use an ID that would otherwise not exist */
- scb->cmd.flush_cache.state = IPS_NORM_STATE;
- scb->cmd.flush_cache.reserved = 0;
- scb->cmd.flush_cache.reserved2 = 0;
- scb->cmd.flush_cache.reserved3 = 0;
- scb->cmd.flush_cache.reserved4 = 0;
-
- ret = ips_send_cmd(ha, scb); /* Send the Flush Command */
-
- if (ret == IPS_SUCCESS) {
- time = 60 * IPS_ONE_SEC; /* Max Wait time is 60 seconds */
+ if (!scb)
+ return;
+
+ memset(scb, 0, sizeof(ips_scb_t));
+ ips_init_scb(ha, scb);
+ scb->scb_busaddr = command_dma;
+
+ scb->timeout = ips_cmd_timeout;
+ scb->cdb[0] = IPS_CMD_FLUSH;
+
+ scb->cmd.flush_cache.op_code = IPS_CMD_FLUSH;
+ scb->cmd.flush_cache.command_id = IPS_MAX_CMDS; /* Use an ID that would otherwise not exist */
+ scb->cmd.flush_cache.state = IPS_NORM_STATE;
+ scb->cmd.flush_cache.reserved = 0;
+ scb->cmd.flush_cache.reserved2 = 0;
+ scb->cmd.flush_cache.reserved3 = 0;
+ scb->cmd.flush_cache.reserved4 = 0;
+
+ ret = ips_send_cmd(ha, scb); /* Send the Flush Command */
+
+ if (ret == IPS_SUCCESS) {
+ time = 60 * IPS_ONE_SEC; /* Max Wait time is 60 seconds */
done = 0;
while ((time > 0) && (!done)) {
@@ -4574,7 +4576,6 @@ ips_flush_and_reset(ips_ha_t *ha)
time--;
}
}
- }
/* Now RESET and INIT the adapter */
(*ha->func.reset) (ha);
--
2.43.0
reply other threads:[~2025-07-23 23:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=aIF2RrQZpJora09i@pc \
--to=salah.triki@gmail.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=aacraid@microsemi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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