From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 24 Feb 2021 18:11:13 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v5.11.2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1dab8a22533e127e709d0daf9a10c154570f6ec;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	xen-netback-delete-napi-instance-when-queue-fails-to-initialize.patch
---

diff --git a/queue-4.4/series b/queue-4.4/series
index 2c5690f80ee..b42cd493b12 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,2 +1,3 @@
 hid-make-arrays-usage-and-value-to-be-the-same.patch
 usb-quirks-add-quirk-to-start-video-capture-on-elmo-l-12f-document-camera-reliable.patch
+xen-netback-delete-napi-instance-when-queue-fails-to-initialize.patch
diff --git a/queue-4.4/xen-netback-delete-napi-instance-when-queue-fails-to-initialize.patch b/queue-4.4/xen-netback-delete-napi-instance-when-queue-fails-to-initialize.patch
new file mode 100644
index 00000000000..8de47450cb0
--- /dev/null
+++ b/queue-4.4/xen-netback-delete-napi-instance-when-queue-fails-to-initialize.patch
@@ -0,0 +1,31 @@
+From 4a658527271bce43afb1cf4feec89afe6716ca59 Mon Sep 17 00:00:00 2001
+From: David Vrabel <david.vrabel@citrix.com>
+Date: Fri, 15 Jan 2016 14:55:35 +0000
+Subject: xen-netback: delete NAPI instance when queue fails to initialize
+
+From: David Vrabel <david.vrabel@citrix.com>
+
+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>
+---
+ 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;
+ }