|
@@ -316,24 +316,24 @@ static inline void seccomp_sync_threads(void)
|
|
put_seccomp_filter(thread);
|
|
put_seccomp_filter(thread);
|
|
smp_store_release(&thread->seccomp.filter,
|
|
smp_store_release(&thread->seccomp.filter,
|
|
caller->seccomp.filter);
|
|
caller->seccomp.filter);
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Don't let an unprivileged task work around
|
|
|
|
+ * the no_new_privs restriction by creating
|
|
|
|
+ * a thread that sets it up, enters seccomp,
|
|
|
|
+ * then dies.
|
|
|
|
+ */
|
|
|
|
+ if (task_no_new_privs(caller))
|
|
|
|
+ task_set_no_new_privs(thread);
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Opt the other thread into seccomp if needed.
|
|
* Opt the other thread into seccomp if needed.
|
|
* As threads are considered to be trust-realm
|
|
* As threads are considered to be trust-realm
|
|
* equivalent (see ptrace_may_access), it is safe to
|
|
* equivalent (see ptrace_may_access), it is safe to
|
|
* allow one thread to transition the other.
|
|
* allow one thread to transition the other.
|
|
*/
|
|
*/
|
|
- if (thread->seccomp.mode == SECCOMP_MODE_DISABLED) {
|
|
|
|
- /*
|
|
|
|
- * Don't let an unprivileged task work around
|
|
|
|
- * the no_new_privs restriction by creating
|
|
|
|
- * a thread that sets it up, enters seccomp,
|
|
|
|
- * then dies.
|
|
|
|
- */
|
|
|
|
- if (task_no_new_privs(caller))
|
|
|
|
- task_set_no_new_privs(thread);
|
|
|
|
-
|
|
|
|
|
|
+ if (thread->seccomp.mode == SECCOMP_MODE_DISABLED)
|
|
seccomp_assign_mode(thread, SECCOMP_MODE_FILTER);
|
|
seccomp_assign_mode(thread, SECCOMP_MODE_FILTER);
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|