UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

seccomp fixes for sparse warnings and s390 build (Tycho) 

-----BEGIN PGP SIGNATURE-----
 Comment: Kees Cook <kees@outflux.net>
 
 iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAlwT2O4WHGtlZXNjb29r
 QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJgHKD/40xYgblxSvOytqgB4rxwLJURCM
 vAcf69H8Oe6k1KDh5Qbb3TTv/v9l+SYoqPmV6wchIhrlHm6Wtys5jvN2oDYKqqFV
 U89o8Vg2TeqDP7Dqs4HEgbcgNi+so3A+9yDJVqSD06fp+skCvK5ta2kV1TQn+vOV
 D1+bWGq42enQ/OYAKa3k/ZtqJ3TxaJ6xzHOTElMXcZaS7728Xv6InKqBQYXB3Zc+
 N+WfVm0F2tz0BeZFWdtWk8ERZN5vH/uJ5mTX/TYFrZiLcW26HxJN8ln2Ou+Apmdd
 sDe8qwVe6/CRYHD9pAXzAwYPbv08PE6JsGMWpnLXuNjfuEVf8TsrG7b8rKI6m8TA
 4sCee1vX8g/xZFwMU/ad3l7IOOpr+NNI/BDDuXNJ5nccpTFFulmZBNO1eBfdQliK
 gn/ESgv4NBoUEy1bGm8AXLm9KWaJSzMEKimGyWDmuRgP0l5RjPWB2ydsVfO5Z5da
 BpGsIqglLHZ/khLoMzjEiXzDr6lUNqIaONQW0OgCx9XtsAJ4o3yyHPzZHvwYAcvA
 kw3shuXbdJXbgy0VxYjooHIQlH9+md46vsgA+f3xPmEXjeZg2kg9vcPBPEDOQy1I
 HLYxSLcZ7PbF+34ysW3XY/C3JN2UZaJUMvQTkvC6rlJ+vX8kakk98JVPdgoNhLYX
 OM/ckbvfuzs1b0f7iw==
 =8IW4
 -----END PGP SIGNATURE-----

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)
This commit is contained in:
James Morris 2018-12-17 11:36:26 -08:00
parent d63962e38c 4fc96ee908
commit 55b8cbe470
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/compat_wrapper.c
View File

@ -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);

3
kernel/seccomp.c
View File

@ -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) {