Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel/git...

seccomp fixes for sparse warnings and s390 build (Tycho)

diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
index 2ce28bf0c5ec44939d815c5187153b0858475aa7..48c4ce668244ae57fc9cb0f5695ba276533be082 100644 (file)
--- 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 15b6be97fc09a3455695d6b97f79f282db3f2a2d..d7f538847b8413eca4c91112f26a563623a59904 100644 (file)
--- 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) {