Commit 55b8cbe4 authored by James Morris's avatar James Morris
Browse files

Merge tag 'seccomp-next-part2' of... 

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)
parents d63962e3 4fc96ee9

arch/s390/kernel/compat_wrapper.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

kernel/seccomp.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {