4.4-stable patches

added patches:
	futex-fix-owner_dead-fixup.patch

diff --git a/queue-4.4/futex-fix-owner_dead-fixup.patch b/queue-4.4/futex-fix-owner_dead-fixup.patch
new file mode 100644 (file)
index 0000000..8547c79
--- /dev/null
+++ b/queue-4.4/futex-fix-owner_dead-fixup.patch
@@ -0,0 +1,60 @@
+From a97cb0e7b3f4c6297fd857055ae8e895f402f501 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Mon, 22 Jan 2018 11:39:47 +0100
+Subject: futex: Fix OWNER_DEAD fixup
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit a97cb0e7b3f4c6297fd857055ae8e895f402f501 upstream.
+
+Both Geert and DaveJ reported that the recent futex commit:
+
+  c1e2f0eaf015 ("futex: Avoid violating the 10th rule of futex")
+
+introduced a problem with setting OWNER_DEAD. We set the bit on an
+uninitialized variable and then entirely optimize it away as a
+dead-store.
+
+Move the setting of the bit to where it is more useful.
+
+Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Reported-by: Dave Jones <davej@codemonkey.org.uk>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Paul E. McKenney <paulmck@us.ibm.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Fixes: c1e2f0eaf015 ("futex: Avoid violating the 10th rule of futex")
+Link: http://lkml.kernel.org/r/20180122103947.GD2228@hirez.programming.kicks-ass.net
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
+Reviewed-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/futex.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2248,10 +2248,6 @@ static int __fixup_pi_state_owner(u32 __
+ 
+       oldowner = pi_state->owner;
+ 
+-      /* Owner died? */
+-      if (!pi_state->owner)
+-              newtid |= FUTEX_OWNER_DIED;
+-
+       /*
+        * We are here because either:
+        *
+@@ -2309,6 +2305,9 @@ retry:
+       }
+ 
+       newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
++      /* Owner died? */
++      if (!pi_state->owner)
++              newtid |= FUTEX_OWNER_DIED;
+ 
+       if (get_futex_value_locked(&uval, uaddr))
+               goto handle_fault;

diff --git a/queue-4.4/series b/queue-4.4/series
index 2d1514f278dab50570dc85aa05e87e840063531d..8b45ffcad07c0421f57c972895ae86c9eb21fc84 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -89,3 +89,4 @@ dm-era-fix-bitset-memory-leaks.patch
 dm-era-use-correct-value-size-in-equality-function-of-writeset-tree.patch
 dm-era-reinitialize-bitset-cache-before-digesting-a-new-writeset.patch
 dm-era-only-resize-metadata-in-preresume.patch
+futex-fix-owner_dead-fixup.patch