xen-netback: delete NAPI instance when queue fails to initialize

commit 4a658527271bce43afb1cf4feec89afe6716ca59 upstream.

When xenvif_connect() fails it may leave a stale NAPI instance added to
the device.  Make sure we delete it in the error path.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: SeongJae Park <sjpark@amazon.com>
Tested-by: Markus Boehme <markubo@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 66260ea74d7ddc6b640e7a2cb0edf171e937f9cb..f9f4391ecee372aac5ba96fcb2a5de3be7a8f4b9 100644 (file)
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -662,6 +662,7 @@ err_tx_unbind:
        queue->tx_irq = 0;
 err_unmap:
        xenvif_unmap_frontend_rings(queue);
+       netif_napi_del(&queue->napi);
 err:
        return err;
 }