From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 28 Nov 2019 07:36:37 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.204~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65a593a0f3b83822606c9e693b59c1e75b876db4;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	net-sysfs-fix-netdev_queue_add_kobject-breakage.patch
---

diff --git a/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch b/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch
new file mode 100644
index 00000000000..0ce88f10980
--- /dev/null
+++ b/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch
@@ -0,0 +1,33 @@
+From 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 20 Nov 2019 19:19:07 -0800
+Subject: net-sysfs: fix netdev_queue_add_kobject() breakage
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 upstream.
+
+kobject_put() should only be called in error path.
+
+Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Jouni Hogander <jouni.hogander@unikie.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/core/net-sysfs.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/core/net-sysfs.c
++++ b/net/core/net-sysfs.c
+@@ -1339,6 +1339,7 @@ static int netdev_queue_add_kobject(stru
+ #endif
+ 
+ 	kobject_uevent(kobj, KOBJ_ADD);
++	return 0;
+ 
+ err:
+ 	kobject_put(kobj);
diff --git a/queue-4.14/series b/queue-4.14/series
index 6e0ba79f2a1..6aa62dbd708 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -209,3 +209,4 @@ powerpc-64s-support-nospectre_v2-cmdline-option.patch
 powerpc-book3s64-fix-link-stack-flush-on-context-switch.patch
 kvm-ppc-book3s-hv-flush-link-stack-on-guest-exit-to-host-kernel.patch
 x86-hyperv-mark-hyperv_init-as-__init-function.patch
+net-sysfs-fix-netdev_queue_add_kobject-breakage.patch