diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:04 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:58 +0200 |
| commit | d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5 (patch) | |
| tree | e194b1968e54380a6654abf7d3a037ca0a010280 /kernel/futex.c | |
| parent | 9a51b86a61214a297cdfc1bb705b7267f9455ae6 (diff) | |
| parent | d5984d2a312144bedccf32aea2298f8df05bb617 (diff) | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.2
Mainly some pca954x work, i.e. removal of unused platform data support
and added support for sysfs interface for manipulating/examining the
idle state. And then a mechanical cocci-style patch.
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index c3b73b0311bc..9e40cf7be606 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3436,6 +3436,10 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int p { 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; |