Takashi Iwai 3df271
From 059a1256d394f62ddd40f638b713fc666c140ecf Mon Sep 17 00:00:00 2001
Takashi Iwai 3df271
From: Dan Carpenter <dan.carpenter@oracle.com>
Takashi Iwai 3df271
Date: Tue, 10 Aug 2021 11:46:13 +0300
Takashi Iwai 3df271
Subject: [PATCH] scsi: smartpqi: Fix an error code in pqi_get_raid_map()
Takashi Iwai 3df271
Git-commit: d1f6581a6796c4e9fd8a4a24e8b77463d18f0df1
Takashi Iwai 3df271
Patch-mainline: v5.15-rc1
Takashi Iwai 3df271
References: stable-5.14.6
Takashi Iwai 3df271
Takashi Iwai 3df271
[ Upstream commit d1f6581a6796c4e9fd8a4a24e8b77463d18f0df1 ]
Takashi Iwai 3df271
Takashi Iwai 3df271
Return -EINVAL on failure instead of success.
Takashi Iwai 3df271
Takashi Iwai 3df271
Link: https://lore.kernel.org/r/20210810084613.GB23810@kili
Takashi Iwai 3df271
Fixes: a91aaae0243b ("scsi: smartpqi: allow for larger raid maps")
Takashi Iwai 3df271
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Takashi Iwai 3df271
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Takashi Iwai 3df271
Signed-off-by: Sasha Levin <sashal@kernel.org>
Takashi Iwai 3df271
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 3df271
Takashi Iwai 3df271
---
Takashi Iwai 3df271
 drivers/scsi/smartpqi/smartpqi_init.c | 1 +
Takashi Iwai 3df271
 1 file changed, 1 insertion(+)
Takashi Iwai 3df271
Takashi Iwai 3df271
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
Takashi Iwai 3df271
index dcc0b9618a64..8819a407c02b 100644
Takashi Iwai 3df271
--- a/drivers/scsi/smartpqi/smartpqi_init.c
Takashi Iwai 3df271
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
Takashi Iwai 3df271
@@ -1322,6 +1322,7 @@ static int pqi_get_raid_map(struct pqi_ctrl_info *ctrl_info,
Takashi Iwai 3df271
 				"requested %u bytes, received %u bytes\n",
Takashi Iwai 3df271
 				raid_map_size,
Takashi Iwai 3df271
 				get_unaligned_le32(&raid_map->structure_size));
Takashi Iwai 3df271
+			rc = -EINVAL;
Takashi Iwai 3df271
 			goto error;
Takashi Iwai 3df271
 		}
Takashi Iwai 3df271
 	}
Takashi Iwai 3df271
-- 
Takashi Iwai 3df271
2.26.2
Takashi Iwai 3df271