| Message ID | 20180727135157.13051-1-vasilyev@ispras.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: 3ware: fix return 0 on the error path of probe | expand |
On Fri, Jul 27, 2018 at 6:52 AM Anton Vasilyev <vasilyev@ispras.ru> wrote: > > 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> > --- > 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 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) || > 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 struct pci_device_id *dev_id) > > if (twl_initialize_device_extension(tw_dev)) { > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension"); > + retval = -ENOMEM; > goto out_free_device_extension; > } > > @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) > tw_dev->base_addr = pci_iomap(pdev, 1, 0); > if (!tw_dev->base_addr) { > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); > + retval = -ENOMEM; > goto out_release_mem_region; > } > > @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct 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 = -ENOMEM; > goto out_iounmap; > } > > 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 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.18.0 > Anton, 3w-9xxx: twa_probe() initializes retval at the top of the function: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2007 so does 3w-xxxx: tw_probe(): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-xxxx.c#n2253 so does 3w-sas: twl_probe(): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-sas.c#n1562 so I think your patch isn't needed... -Adam
Adam, 3w-9xxx: twa_probe(): There is check of retval: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2010 retval without assignement is 0 on fail of twa_initialize_device_ extension(): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2040 And this 0 is returned from probe on the error path. Same pattern is true for all other cases from patch. -Anton 27 июл. 2018 г. 9:42 ПП пользователь "adam radford" <aradford@gmail.com> написал: On Fri, Jul 27, 2018 at 6:52 AM Anton Vasilyev <vasilyev@ispras.ru> wrote: > > 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> > --- > 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 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) || > 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 struct pci_device_id *dev_id) > > if (twl_initialize_device_extension(tw_dev)) { > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension"); > + retval = -ENOMEM; > goto out_free_device_extension; > } > > @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) > tw_dev->base_addr = pci_iomap(pdev, 1, 0); > if (!tw_dev->base_addr) { > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); > + retval = -ENOMEM; > goto out_release_mem_region; > } > > @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct 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 = -ENOMEM; > goto out_iounmap; > } > > 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 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.18.0 > Anton, 3w-9xxx: twa_probe() initializes retval at the top of the function: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2007 so does 3w-xxxx: tw_probe(): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-xxxx.c#n2253 so does 3w-sas: twl_probe(): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-sas.c#n1562 so I think your patch isn't needed... -Adam <div dir="auto"><div>Adam,</div><div dir="auto"><br></div><div dir="auto"><span style="font-family:sans-serif">3w-9xxx: twa_probe():</span></div><div dir="auto"><font face="sans-serif"><br></font>There is check of retval:</div><div dir="auto"><a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2010" target="_blank" rel="noreferrer">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2010</a></div><div dir="auto"><br></div><div dir="auto">retval without assignement is 0 on fail of <span style="font-family:sans-serif">twa_initialize_device_</span><span style="font-family:sans-serif">extension():</span></div><div dir="auto"><span style="font-family:sans-serif"><a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2040">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2040</a></span><br></div><div dir="auto"><font face="sans-serif"><br></font></div><div dir="auto"><font face="sans-serif">And this 0 is returned from probe on the error path.</font></div><div dir="auto"><font face="sans-serif"><br></font></div><div dir="auto"><font face="sans-serif">Same pattern is true for all other cases from patch.</font></div><div dir="auto"><font face="sans-serif"><br></font></div><div dir="auto"><font face="sans-serif">-Anton<br></font><div class="gmail_extra" dir="auto"><br><div class="gmail_quote">27 июл. 2018 г. 9:42 ПП пользователь "adam radford" <<a href="mailto:aradford@gmail.com" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">aradford@gmail.com</a>> написал:<br type="attribution"><blockquote class="m_-8378120472432222872m_7650373726616114635m_-7730006977630316119m_-622452158064295311m_-1586320276793739959quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_-8378120472432222872m_7650373726616114635m_-7730006977630316119m_-622452158064295311m_-1586320276793739959elided-text">On Fri, Jul 27, 2018 at 6:52 AM Anton Vasilyev <<a href="mailto:vasilyev@ispras.ru" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">vasilyev@ispras.ru</a>> wrote:<br> ><br> > tw_probe() returns 0 in case of fail of tw_initialize_device_extension(),<br> > pci_resource_start() or tw_reset_sequence() and releases resources.<br> > twl_probe() returns 0 in case of fail of twl_initialize_device_extension(),<br> > pci_iomap() and twl_reset_sequence().<br> > twa_probe() returns 0 in case of fail of tw_initialize_device_extension(),<br> > ioremap() and twa_reset_sequence().<br> ><br> ><br> > The patch adds retval initialization for these cases.<br> ><br> > Found by Linux Driver Verification project (<a href="http://linuxtesting.org" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">linuxtesting.org</a>).<br> ><br> > Signed-off-by: Anton Vasilyev <<a href="mailto:vasilyev@ispras.ru" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">vasilyev@ispras.ru</a>><br> > ---<br> > drivers/scsi/3w-9xxx.c | 6 +++++-<br> > drivers/scsi/3w-sas.c | 3 +++<br> > drivers/scsi/3w-xxxx.c | 2 ++<br> > 3 files changed, 10 insertions(+), 1 deletion(-)<br> ><br> > diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c<br> > index 99ba4a770406..27521fc3ef5a 100644<br> > --- a/drivers/scsi/3w-9xxx.c<br> > +++ b/drivers/scsi/3w-9xxx.c<br> > @@ -2038,6 +2038,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> ><br> > if (twa_initialize_device_extension(tw_dev)) {<br> > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x25, "Failed to initialize device extension");<br> > + retval = -ENOMEM;<br> > goto out_free_device_extension;<br> > }<br> ><br> > @@ -2060,6 +2061,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> > tw_dev->base_addr = ioremap(mem_addr, mem_len);<br> > if (!tw_dev->base_addr) {<br> > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");<br> > + retval = -ENOMEM;<br> > goto out_release_mem_region;<br> > }<br> ><br> > @@ -2067,8 +2069,10 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> > TW_DISABLE_INTERRUPTS(tw_dev);<br> ><br> > /* Initialize the card */<br> > - if (twa_reset_sequence(tw_dev, 0))<br> > + if (twa_reset_sequence(tw_dev, 0)) {<br> > + retval = -ENOMEM;<br> > goto out_iounmap;<br> > + }<br> ><br> > /* Set host specific parameters */<br> > if ((pdev->device == PCI_DEVICE_ID_3WARE_9650SE) ||<br> > diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c<br> > index cf9f2a09b47d..40c1e6e64f58 100644<br> > --- a/drivers/scsi/3w-sas.c<br> > +++ b/drivers/scsi/3w-sas.c<br> > @@ -1594,6 +1594,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> ><br> > if (twl_initialize_device_extension(tw_dev)) {<br> > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension");<br> > + retval = -ENOMEM;<br> > goto out_free_device_extension;<br> > }<br> ><br> > @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> > tw_dev->base_addr = pci_iomap(pdev, 1, 0);<br> > if (!tw_dev->base_addr) {<br> > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap");<br> > + retval = -ENOMEM;<br> > goto out_release_mem_region;<br> > }<br> ><br> > @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> > /* Initialize the card */<br> > if (twl_reset_sequence(tw_dev, 0)) {<br> > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1d, "Controller reset failed during probe");<br> > + retval = -ENOMEM;<br> > goto out_iounmap;<br> > }<br> ><br> > diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c<br> > index f6179e3d6953..961ea6f7def8 100644<br> > --- a/drivers/scsi/3w-xxxx.c<br> > +++ b/drivers/scsi/3w-xxxx.c<br> > @@ -2280,6 +2280,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> ><br> > if (tw_initialize_device_extension(tw_dev)) {<br> > printk(KERN_WARNING "3w-xxxx: Failed to initialize device extension.");<br> > + retval = -ENOMEM;<br> > goto out_free_device_extension;<br> > }<br> ><br> > @@ -2294,6 +2295,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)<br> > tw_dev->base_addr = pci_resource_start(pdev, 0);<br> > if (!tw_dev->base_addr) {<br> > printk(KERN_WARNING "3w-xxxx: Failed to get io address.");<br> > + retval = -ENOMEM;<br> > goto out_release_mem_region;<br> > }<br> ><br> > --<br> > 2.18.0<br> ><br> <br></div> Anton,<br> <br> 3w-9xxx: twa_probe() initializes retval at the top of the function:<br> <br> <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2007" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2007</a><br> <br> so does 3w-xxxx: tw_probe():<br> <br> <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-xxxx.c#n2253" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-xxxx.c#n2253</a><br> <br> so does 3w-sas: twl_probe():<br> <br> <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-sas.c#n1562" rel="noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-sas.c#n1562</a><br> <br> so I think your patch isn't needed...<div class="m_-8378120472432222872m_7650373726616114635m_-7730006977630316119m_-622452158064295311m_-1586320276793739959signature-text"><br> <br> -Adam<br> </div></blockquote></div><br></div><div class="gmail_extra" dir="auto"><br></div></div></div>
On Sat, Jul 28, 2018 at 8:18 AM Anton Vasilyev <anton.vasilyev.87@gmail.com> wrote: > > Adam, > > 3w-9xxx: twa_probe(): > > There is check of retval: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2010 > > retval without assignement is 0 on fail of twa_initialize_device_extension(): > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2040 > > And this 0 is returned from probe on the error path. > > Same pattern is true for all other cases from patch. > > -Anton > > 27 июл. 2018 г. 9:42 ПП пользователь "adam radford" <aradford@gmail.com> написал: > > On Fri, Jul 27, 2018 at 6:52 AM Anton Vasilyev <vasilyev@ispras.ru> wrote: > > > > 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> > > --- > > 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 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) || > > 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 struct pci_device_id *dev_id) > > > > if (twl_initialize_device_extension(tw_dev)) { > > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension"); > > + retval = -ENOMEM; > > goto out_free_device_extension; > > } > > > > @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) > > tw_dev->base_addr = pci_iomap(pdev, 1, 0); > > if (!tw_dev->base_addr) { > > TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); > > + retval = -ENOMEM; > > goto out_release_mem_region; > > } > > > > @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct 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 = -ENOMEM; > > goto out_iounmap; > > } > > > > 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 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.18.0 > > > > Anton, > > 3w-9xxx: twa_probe() initializes retval at the top of the function: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-9xxx.c#n2007 > > so does 3w-xxxx: tw_probe(): > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-xxxx.c#n2253 > > so does 3w-sas: twl_probe(): > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/3w-sas.c#n1562 > > so I think your patch isn't needed... > > > -Adam > > > Acked-by: Adam Radford <aradford@gmail.com>
Anton, > 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(). Applied to 4.19/scsi-queue, thanks!
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 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) || 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 struct pci_device_id *dev_id) if (twl_initialize_device_extension(tw_dev)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension"); + retval = -ENOMEM; goto out_free_device_extension; } @@ -1608,6 +1609,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr = pci_iomap(pdev, 1, 0); if (!tw_dev->base_addr) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); + retval = -ENOMEM; goto out_release_mem_region; } @@ -1617,6 +1619,7 @@ static int twl_probe(struct pci_dev *pdev, const struct 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 = -ENOMEM; goto out_iounmap; } 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 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; }
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> --- 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(-)