| Message ID | 20201015084053.56158-1-jingxiangfeng@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] thunderbolt: Add the missed ida_simple_remove() in ring_request_msix() | expand |
On Thu, Oct 15, 2020 at 04:40:53PM +0800, Jing Xiangfeng wrote: > ring_request_msix() misses to call ida_simple_remove() in an error path. > Add a label 'err_ida_remove' and jump to it. FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Fixes: 046bee1f9ab8 ("thunderbolt: Add MSI-X support") > Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> > --- When new version is issued do not forget to add changelog here (after cutter '---' line). > drivers/thunderbolt/nhi.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c > index 5f7489fa1327..a331e52789e3 100644 > --- a/drivers/thunderbolt/nhi.c > +++ b/drivers/thunderbolt/nhi.c > @@ -405,12 +405,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend) > > ring->vector = ret; > > - ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector); > - if (ring->irq < 0) > - return ring->irq; > + ret = pci_irq_vector(ring->nhi->pdev, ring->vector); > + if (ret < 0) > + goto err_ida_remove; > + > + ring->irq = ret; > > irqflags = no_suspend ? IRQF_NO_SUSPEND : 0; > - return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring); > + ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring); > + if (ret) > + goto err_ida_remove; > + > + return 0; > + > +err_ida_remove: > + ida_simple_remove(&nhi->msix_ida, ring->vector); > + > + return ret; > } > > static void ring_release_msix(struct tb_ring *ring) > -- > 2.17.1 >
On Thu, Oct 15, 2020 at 04:40:53PM +0800, Jing Xiangfeng wrote: > ring_request_msix() misses to call ida_simple_remove() in an error path. > Add a label 'err_ida_remove' and jump to it. > > Fixes: 046bee1f9ab8 ("thunderbolt: Add MSI-X support") > Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> Applied to thunderbolt.git/fixes, thanks!
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index 5f7489fa1327..a331e52789e3 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c @@ -405,12 +405,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend) ring->vector = ret; - ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector); - if (ring->irq < 0) - return ring->irq; + ret = pci_irq_vector(ring->nhi->pdev, ring->vector); + if (ret < 0) + goto err_ida_remove; + + ring->irq = ret; irqflags = no_suspend ? IRQF_NO_SUSPEND : 0; - return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring); + ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring); + if (ret) + goto err_ida_remove; + + return 0; + +err_ida_remove: + ida_simple_remove(&nhi->msix_ida, ring->vector); + + return ret; } static void ring_release_msix(struct tb_ring *ring)
ring_request_msix() misses to call ida_simple_remove() in an error path. Add a label 'err_ida_remove' and jump to it. Fixes: 046bee1f9ab8 ("thunderbolt: Add MSI-X support") Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> --- drivers/thunderbolt/nhi.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)