scsi: megaraid_sas: Add check to avoid potential NULL pointer dereference

[PATCH] scsi: megaraid_sas: Add check to avoid potential NULL pointer dereference

Jiasheng Jiang posted 1 patch 2 months ago

Download mbox

drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] scsi: megaraid_sas: Add check to avoid potential NULL pointer dereference

Posted by Jiasheng Jiang 2 months ago

Add check for the return value of megasas_get_cmd_fusion() to avoid
potential NULL pointer dereference in megasas_prepare_secondRaid1_IO()
if r1_cmd is NULL.

Fixes: 69c337c0f8d7 ("scsi: megaraid_sas: SAS3.5 Generic Megaraid Controllers Fast Path for RAID 1/10 Writes")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index a6794f49e9fa..4f1c1a5a71a8 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3426,7 +3426,8 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
 	if (cmd->r1_alt_dev_handle != MR_DEVHANDLE_INVALID) {
 		r1_cmd = megasas_get_cmd_fusion(instance,
 				scsi_cmd_to_rq(scmd)->tag + instance->max_fw_cmds);
-		megasas_prepare_secondRaid1_IO(instance, cmd, r1_cmd);
+		if (r1_cmd)
+			megasas_prepare_secondRaid1_IO(instance, cmd, r1_cmd);
 	}
 
 
-- 
2.25.1