From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr700093.outbound.protection.outlook.com ([40.107.70.93]:58944 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726426AbeIBRUs (ORCPT ); Sun, 2 Sep 2018 13:20:48 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Anton Vasilyev , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL 4.18 064/131] scsi: 3ware: fix return 0 on the error path of probe Date: Sun, 2 Sep 2018 13:04:22 +0000 Message-ID: <20180902064601.183036-64-alexander.levin@microsoft.com> References: <20180902064601.183036-1-alexander.levin@microsoft.com> In-Reply-To: <20180902064601.183036-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Anton Vasilyev [ Upstream commit 4dc98c1995482262e70e83ef029135247fafe0f2 ] 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 Acked-by: Adam Radford Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/3w-9xxx.c | 6 +++++- drivers/scsi/3w-sas.c | 3 +++ drivers/scsi/3w-xxxx.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 99ba4a770406..27521fc3ef5a 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c @@ -2038,6 +2038,7 @@ static int twa_probe(struct pci_dev *pdev, const stru= ct pci_device_id *dev_id) =20 if (twa_initialize_device_extension(tw_dev)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x25, "Failed to initialize device ex= tension"); + retval =3D -ENOMEM; goto out_free_device_extension; } =20 @@ -2060,6 +2061,7 @@ static int twa_probe(struct pci_dev *pdev, const stru= ct pci_device_id *dev_id) tw_dev->base_addr =3D ioremap(mem_addr, mem_len); if (!tw_dev->base_addr) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap"); + retval =3D -ENOMEM; goto out_release_mem_region; } =20 @@ -2067,8 +2069,10 @@ static int twa_probe(struct pci_dev *pdev, const str= uct pci_device_id *dev_id) TW_DISABLE_INTERRUPTS(tw_dev); =20 /* Initialize the card */ - if (twa_reset_sequence(tw_dev, 0)) + if (twa_reset_sequence(tw_dev, 0)) { + retval =3D -ENOMEM; goto out_iounmap; + } =20 /* Set host specific parameters */ if ((pdev->device =3D=3D PCI_DEVICE_ID_3WARE_9650SE) || diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index cf9f2a09b47d..40c1e6e64f58 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1594,6 +1594,7 @@ static int twl_probe(struct pci_dev *pdev, const stru= ct pci_device_id *dev_id) =20 if (twl_initialize_device_extension(tw_dev)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device ex= tension"); + retval =3D -ENOMEM; goto out_free_device_extension; } =20 @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const stru= ct pci_device_id *dev_id) tw_dev->base_addr =3D pci_iomap(pdev, 1, 0); if (!tw_dev->base_addr) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); + retval =3D -ENOMEM; goto out_release_mem_region; } =20 @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const stru= ct pci_device_id *dev_id) /* Initialize the card */ if (twl_reset_sequence(tw_dev, 0)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1d, "Controller reset failed during= probe"); + retval =3D -ENOMEM; goto out_iounmap; } =20 diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index f6179e3d6953..961ea6f7def8 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -2280,6 +2280,7 @@ static int tw_probe(struct pci_dev *pdev, const struc= t pci_device_id *dev_id) =20 if (tw_initialize_device_extension(tw_dev)) { printk(KERN_WARNING "3w-xxxx: Failed to initialize device extension."); + retval =3D -ENOMEM; goto out_free_device_extension; } =20 @@ -2294,6 +2295,7 @@ static int tw_probe(struct pci_dev *pdev, const struc= t pci_device_id *dev_id) tw_dev->base_addr =3D pci_resource_start(pdev, 0); if (!tw_dev->base_addr) { printk(KERN_WARNING "3w-xxxx: Failed to get io address."); + retval =3D -ENOMEM; goto out_release_mem_region; } =20 --=20 2.17.1