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-xxxx.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/src/3w-xxxx.c b/src/3w-xxxx.c

index a40d353bd8b3981986ee1e4fea3ed6771b078f7e..471366945bd4fc8b3d92ede8247f8a4d5706d508 100644

--- a/src/3w-xxxx.c

+++ b/src/3w-xxxx.c

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

 	if (tw_initialize_device_extension(tw_dev)) {

 		printk(KERN_WARNING "3w-xxxx: Failed to initialize device extension.");

+		retval = -ENOMEM;

 		goto out_free_device_extension;

 	}

@@ -2294,6 +2295,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

 	tw_dev->base_addr = pci_resource_start(pdev, 0);

 	if (!tw_dev->base_addr) {

 		printk(KERN_WARNING "3w-xxxx: Failed to get io address.");

+		retval = -ENOMEM;

 		goto out_release_mem_region;

 	}

-- 

2.31.1