From 4dc98c1995482262e70e83ef029135247fafe0f2 Mon Sep 17 00:00:00 2001

From: Anton Vasilyev <vasilyev@ispras.ru>

Date: Fri, 27 Jul 2018 16:51:57 +0300

Subject: [Backport 4dc98c199548] scsi: 3ware: fix return 0 on the error path

 of probe

tw_probe() returns 0 in case of fail of tw_initialize_device_extension(),

pci_resource_start() or tw_reset_sequence() and releases resources.

twl_probe() returns 0 in case of fail of twl_initialize_device_extension(),

pci_iomap() and twl_reset_sequence().  twa_probe() returns 0 in case of

fail of tw_initialize_device_extension(), ioremap() and

twa_reset_sequence().

The patch adds retval initialization for these cases.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru>

Acked-by: Adam Radford <aradford@gmail.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

---

 src/3w-9xxx.c | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/3w-9xxx.c b/src/3w-9xxx.c

index 99ba4a770406e3d50bfa16ccc0bd2f392bda3ca5..27521fc3ef5abc4008d617862dcb1ca473ed925d 100644

--- a/src/3w-9xxx.c

+++ b/src/3w-9xxx.c

@@ -2038,6 +2038,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

 	if (twa_initialize_device_extension(tw_dev)) {

 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x25, "Failed to initialize device extension");

+		retval = -ENOMEM;

 		goto out_free_device_extension;

 	}

@@ -2060,6 +2061,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

 	tw_dev->base_addr = ioremap(mem_addr, mem_len);

 	if (!tw_dev->base_addr) {

 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");

+		retval = -ENOMEM;

 		goto out_release_mem_region;

 	}

@@ -2067,8 +2069,10 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

 	TW_DISABLE_INTERRUPTS(tw_dev);

 	/* Initialize the card */

-	if (twa_reset_sequence(tw_dev, 0))

+	if (twa_reset_sequence(tw_dev, 0)) {

+		retval = -ENOMEM;

 		goto out_iounmap;

+	}

 	/* Set host specific parameters */

 	if ((pdev->device == PCI_DEVICE_ID_3WARE_9650SE) ||

-- 

2.31.1