[PATCH 4.4 03/93] xen-netback: delete NAPI instance when queue fails to initialize

From: Greg Kroah-Hartman
Date: Mon Mar 01 2021 - 11:29:43 EST


From: David Vrabel <david.vrabel@xxxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: SeongJae Park <sjpark@xxxxxxxxxx>
Tested-by: Markus Boehme <markubo@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/xen-netback/interface.c | 1 +
1 file changed, 1 insertion(+)

--- 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;
}