projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'linux-watchdog-5.12-rc1' of git://www.linux-watchdog.org/linux-watchdog
[linux-2.6-microblaze.git]
/
kernel
/
seccomp.c
diff --git
a/kernel/seccomp.c
b/kernel/seccomp.c
index
952dc1c
..
1d60fc2
100644
(file)
--- a/
kernel/seccomp.c
+++ b/
kernel/seccomp.c
@@
-1164,7
+1164,7
@@
static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,
* Make sure that any changes to mode from another thread have
* been seen after SYSCALL_WORK_SECCOMP was seen.
*/
- rmb();
+
smp_
rmb();
if (!sd) {
populate_seccomp_data(&sd_local);
@@
-1284,6
+1284,8
@@
static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,
const bool recheck_after_trace)
{
BUG();
+
+ return -1;
}
#endif