ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'seccomp-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Browse Source 
Pull seccomp updates from Kees Cook:
 "Two small seccomp updates.

  This contains a fix for a build failure that went unnoticed for many
  years, and a memory barrier correction:

   - Fix a non-FILTER build failure for some architectures (Paul
     Cercueil)

   - Improve performance with correct memory barrier (wanghongzhe)"

* tag 'seccomp-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Improve performace by optimizing rmb()
  seccomp: Add missing return in non-void function
This commit is contained in:
Linus Torvalds
2021-02-21 17:12:18 -08:00
parent 92ae63c07b a381b70a1c
commit 177626c6d5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/seccomp.c
View File

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