Merge tag 'media/v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-jammy-kernel.git] / kernel / seccomp.c

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 952dc1c902295ffe65ce24541dac98ff4dccf8d9..1d60fc2c99871e83ed69e9558506f503e4cacefc 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