2023-05-05 14:40:19

by Yuchen Yang

Subject: [PATCH] drivers: scsi: 3w-xxxx: Add error handling for initialization failure in `tw_probe`

Smatch complains that:
tw_probe() warn: missing error code 'retval'

This patch adds error checking to `tw_probe` function to handle
initialization failure. If `tw_reset_sequence` function returns a
non-zero value, the function will return an `-EINVAL` error code
to indicate the initialization failure.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yuchen Yang <[email protected]>
Reviewed-by: Dan Carpenter <[email protected]>
---
The issue is found by static analyzer. The patched code has passed
Smatch checker, but remains untested on real device.
---
drivers/scsi/3w-xxxx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 36c34ced0cc1..641b8a2bbbd5 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2305,8 +2305,10 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
TW_DISABLE_INTERRUPTS(tw_dev);

/* Initialize the card */
- if (tw_reset_sequence(tw_dev))
+ if (tw_reset_sequence(tw_dev)) {
+ retval = -EINVAL;
goto out_release_mem_region;
+ }

/* Set host specific parameters */
host->max_id = TW_MAX_UNITS;
--
2.25.1

2023-05-22 21:50:27

by Martin K. Petersen

Subject: Re: [PATCH] drivers: scsi: 3w-xxxx: Add error handling for initialization failure in `tw_probe`

Yuchen,

> Smatch complains that:
> tw_probe() warn: missing error code 'retval'
>
> This patch adds error checking to `tw_probe` function to handle
> initialization failure. If `tw_reset_sequence` function returns a
> non-zero value, the function will return an `-EINVAL` error code
> to indicate the initialization failure.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Yuchen Yang <[email protected]>
> Reviewed-by: Dan Carpenter <[email protected]>

Applied to 6.5/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2023-06-01 00:50:51

by Martin K. Petersen

Subject: Re: [PATCH] drivers: scsi: 3w-xxxx: Add error handling for initialization failure in `tw_probe`

On Fri, 05 May 2023 22:12:55 +0800, Yuchen Yang wrote:

> Smatch complains that:
> tw_probe() warn: missing error code 'retval'
>
> This patch adds error checking to `tw_probe` function to handle
> initialization failure. If `tw_reset_sequence` function returns a
> non-zero value, the function will return an `-EINVAL` error code
> to indicate the initialization failure.
>
> [...]

Applied to 6.5/scsi-queue, thanks!

[1/1] drivers: scsi: 3w-xxxx: Add error handling for initialization failure in `tw_probe`
https://git.kernel.org/mkp/scsi/c/2e2fe5ac695a

--
Martin K. Petersen Oracle Linux Engineering