aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2018-12-17 11:36:26 -0800
committerJames Morris <james.morris@microsoft.com>2018-12-17 11:36:26 -0800
commit55b8cbe470d103b44104c64dbf89e5cad525d4e0 (patch)
tree4c2d3da4c5a2493965be4bda2f6834c6eaaddd75
parentd63962e38cc0a94cce4f39b8b171cdb55b69a4a5 (diff)
parent4fc96ee9085d39ceeaa7b60cd475d0a474e7062f (diff)
downloadlinux-stericsson-55b8cbe470d103b44104c64dbf89e5cad525d4e0.tar.gz
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)
-rw-r--r--arch/s390/kernel/compat_wrapper.c2
-rw-r--r--kernel/seccomp.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
index 2ce28bf0c5ec..48c4ce668244 100644
--- a/arch/s390/kernel/compat_wrapper.c
+++ b/arch/s390/kernel/compat_wrapper.c
@@ -164,7 +164,7 @@ COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, fla
COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags);
COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags);
COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);
-COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs)
+COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, void __user *, uargs)
COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags)
COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags)
COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);
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) {