diff options
| author | James Morris <james.morris@microsoft.com> | 2018-12-17 11:36:26 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-17 11:36:26 -0800 |
| commit | 55b8cbe470d103b44104c64dbf89e5cad525d4e0 (patch) | |
| tree | 4c2d3da4c5a2493965be4bda2f6834c6eaaddd75 /kernel | |
| parent | d63962e38cc0a94cce4f39b8b171cdb55b69a4a5 (diff) | |
| parent | 4fc96ee9085d39ceeaa7b60cd475d0a474e7062f (diff) | |
Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-seccomp
seccomp fixes for sparse warnings and s390 build (Tycho)
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/seccomp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 15b6be97fc09..d7f538847b84 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1169,8 +1169,7 @@ static __poll_t seccomp_notify_poll(struct file *file, poll_wait(file, &filter->notif->wqh, poll_tab); - ret = mutex_lock_interruptible(&filter->notify_lock); - if (ret < 0) + if (mutex_lock_interruptible(&filter->notify_lock) < 0) return EPOLLERR; list_for_each_entry(cur, &filter->notif->notifications, list) { |