Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/scsi-hpsa-fix-allocation-size-for-scsi_host_alloc.patch b/queue-4.14/scsi-hpsa-fix-allocation-size-for-scsi_host_alloc.patch
new file mode 100644 (file)
index 0000000..10b92c6
--- /dev/null
+++ b/queue-4.14/scsi-hpsa-fix-allocation-size-for-scsi_host_alloc.patch
@@ -0,0 +1,40 @@
+From a2d6314421e15f21a5fb5974f983085163396e3f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 18 Jan 2023 06:12:55 +0300
+Subject: scsi: hpsa: Fix allocation size for scsi_host_alloc()
+
+From: Alexey V. Vissarionov <gremlin@altlinux.org>
+
+[ Upstream commit bbbd25499100c810ceaf5193c3cfcab9f7402a33 ]
+
+The 'h' is a pointer to struct ctlr_info, so it's just 4 or 8 bytes, while
+the structure itself is much bigger.
+
+Found by Linux Verification Center (linuxtesting.org) with SVACE.
+
+Fixes: edd163687ea5 ("hpsa: add driver for HP Smart Array controllers.")
+Link: https://lore.kernel.org/r/20230118031255.GE15213@altlinux.org
+Signed-off-by: Alexey V. Vissarionov <gremlin@altlinux.org>
+Acked-by: Don Brace <don.brace@microchip.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/scsi/hpsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
+index 6b25c5ce13ed..34434b7107ee 100644
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -5627,7 +5627,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h)
+ {
+       struct Scsi_Host *sh;
+ 
+-      sh = scsi_host_alloc(&hpsa_driver_template, sizeof(h));
++      sh = scsi_host_alloc(&hpsa_driver_template, sizeof(struct ctlr_info));
+       if (sh == NULL) {
+               dev_err(&h->pdev->dev, "scsi_host_alloc failed\n");
+               return -ENOMEM;
+-- 
+2.39.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 8baf271bf6fa172505a434e66d23a34b506794fe..ede16c54f89f746e39b867842bfe45cbc609d859 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -22,3 +22,4 @@ w1-fix-warning-after-calling-w1_process.patch
 comedi-adv_pci1760-fix-pwm-instruction-handling.patch
 fs-reiserfs-remove-useless-new_opts-in-reiserfs_remount.patch
 bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
+scsi-hpsa-fix-allocation-size-for-scsi_host_alloc.patch