3.18-stable patches

added patches:
	futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch

diff --git a/queue-3.18/futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch b/queue-3.18/futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch
new file mode 100644 (file)
index 0000000..e938d1b
--- /dev/null
+++ b/queue-3.18/futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch
@@ -0,0 +1,47 @@
+From 5a07168d8d89b00fe1760120714378175b3ef992 Mon Sep 17 00:00:00 2001
+From: Chen Jie <chenjie6@huawei.com>
+Date: Fri, 15 Mar 2019 03:44:38 +0000
+Subject: futex: Ensure that futex address is aligned in handle_futex_death()
+
+From: Chen Jie <chenjie6@huawei.com>
+
+commit 5a07168d8d89b00fe1760120714378175b3ef992 upstream.
+
+The futex code requires that the user space addresses of futexes are 32bit
+aligned. sys_futex() checks this in futex_get_keys() but the robust list
+code has no alignment check in place.
+
+As a consequence the kernel crashes on architectures with strict alignment
+requirements in handle_futex_death() when trying to cmpxchg() on an
+unaligned futex address which was retrieved from the robust list.
+
+[ tglx: Rewrote changelog, proper sizeof() based alignement check and add
+       comment ]
+
+Fixes: 0771dfefc9e5 ("[PATCH] lightweight robust futexes: core")
+Signed-off-by: Chen Jie <chenjie6@huawei.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: <dvhart@infradead.org>
+Cc: <peterz@infradead.org>
+Cc: <zengweilin@huawei.com>
+Cc: stable@vger.kernel.org
+Link: https://lkml.kernel.org/r/1552621478-119787-1-git-send-email-chenjie6@huawei.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/futex.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2897,6 +2897,10 @@ int handle_futex_death(u32 __user *uaddr
+ {
+       u32 uval, uninitialized_var(nval), mval;
+ 
++      /* Futex address must be 32bit aligned */
++      if ((((unsigned long)uaddr) % sizeof(*uaddr)) != 0)
++              return -1;
++
+ retry:
+       if (get_user(uval, uaddr))
+               return -1;

diff --git a/queue-3.18/series b/queue-3.18/series
index 0fc7b93b4e651940b12a79187ee26b51fb6f57ea..0e73f67d9a2d6e61d9c6e5f0d0fda8dd12db4993 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1 +1,2 @@
 udf-fix-crash-on-io-error-during-truncate.patch
+futex-ensure-that-futex-address-is-aligned-in-handle_futex_death.patch