From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 31 Jul 2017 20:52:26 +0000 (-0700)
Subject: 4.4-stable patches
X-Git-Tag: v4.12.5~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd5b9f34deca2e881c50d5c0ea3d996ed285fcc1;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	powerpc-pseries-fix-of_node_put-underflow-during-reconfig-remove.patch
---

diff --git a/queue-4.4/powerpc-pseries-fix-of_node_put-underflow-during-reconfig-remove.patch b/queue-4.4/powerpc-pseries-fix-of_node_put-underflow-during-reconfig-remove.patch
new file mode 100644
index 00000000000..bc711ee457e
--- /dev/null
+++ b/queue-4.4/powerpc-pseries-fix-of_node_put-underflow-during-reconfig-remove.patch
@@ -0,0 +1,37 @@
+From 4fd1bd443e80b12f0a01a45fb9a793206b41cb72 Mon Sep 17 00:00:00 2001
+From: Laurent Vivier <lvivier@redhat.com>
+Date: Fri, 21 Jul 2017 16:51:39 +0200
+Subject: powerpc/pseries: Fix of_node_put() underflow during reconfig remove
+
+From: Laurent Vivier <lvivier@redhat.com>
+
+commit 4fd1bd443e80b12f0a01a45fb9a793206b41cb72 upstream.
+
+As for commit 68baf692c435 ("powerpc/pseries: Fix of_node_put()
+underflow during DLPAR remove"), the call to of_node_put() must be
+removed from pSeries_reconfig_remove_node().
+
+dlpar_detach_node() and pSeries_reconfig_remove_node() both call
+of_detach_node(), and thus the node should not be released in both
+cases.
+
+Fixes: 0829f6d1f69e ("of: device_node kobject lifecycle fixes")
+Signed-off-by: Laurent Vivier <lvivier@redhat.com>
+Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/platforms/pseries/reconfig.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/powerpc/platforms/pseries/reconfig.c
++++ b/arch/powerpc/platforms/pseries/reconfig.c
+@@ -82,7 +82,6 @@ static int pSeries_reconfig_remove_node(
+ 
+ 	of_detach_node(np);
+ 	of_node_put(parent);
+-	of_node_put(np); /* Must decrement the refcount */
+ 	return 0;
+ }
+ 
diff --git a/queue-4.4/series b/queue-4.4/series
index b7bbd66adf5..31ca9345c7f 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,3 +1,4 @@
 af_key-add-lock-to-key-dump.patch
 pstore-make-spinlock-per-zone-instead-of-global.patch
 net-reduce-skb_warn_bad_offload-noise.patch
+powerpc-pseries-fix-of_node_put-underflow-during-reconfig-remove.patch