diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-04 16:40:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-04 16:40:32 +0100 |
| commit | 724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7 (patch) | |
| tree | 6cc08145262424ad6c8179457ed188656c41015f /kernel/futex.c | |
| parent | da31de35cd2fb78f75788873e0b61e56d4bb1a90 (diff) | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
| download | linux-next-724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7.tar.gz linux-next-724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7.zip | |
Merge 5.10-rc2 into tty-next
We need the tty/vt/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index be68ac0d49ad..f8614ef4ff31 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1503,8 +1503,10 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_ */ newval = FUTEX_WAITERS | task_pid_vnr(new_owner); - if (unlikely(should_fail_futex(true))) + if (unlikely(should_fail_futex(true))) { ret = -EFAULT; + goto out_unlock; + } ret = cmpxchg_futex_value_locked(&curval, uaddr, uval, newval); if (!ret && (curval != uval)) { |