The patch titled Subject: seccomp: allow COMPAT sigreturn overrides has been added to the -mm tree. Its filename is seccomp-allow-compat-sigreturn-overrides.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/seccomp-allow-compat-sigreturn-overrides.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/seccomp-allow-compat-sigreturn-overrides.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Kees Cook <keescook@xxxxxxxxxxxx> Subject: seccomp: allow COMPAT sigreturn overrides Most architectures don't need to do much special for the strict-mode seccomp syscall entries. Remove the redundant headers and reduce the others. This patch (of 8): Some architectures may need to override the compat sigreturn definition, as is already possible in the non-compat case. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Michal Simek <monstr@xxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: Daniel Borkmann <dborkman@xxxxxxxxxx> Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx> Cc: James Hogan <james.hogan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/seccomp.h | 2 ++ 1 file changed, 2 insertions(+) diff -puN include/asm-generic/seccomp.h~seccomp-allow-compat-sigreturn-overrides include/asm-generic/seccomp.h --- a/include/asm-generic/seccomp.h~seccomp-allow-compat-sigreturn-overrides +++ a/include/asm-generic/seccomp.h @@ -17,7 +17,9 @@ #define __NR_seccomp_read_32 __NR_read #define __NR_seccomp_write_32 __NR_write #define __NR_seccomp_exit_32 __NR_exit +#ifndef __NR_seccomp_sigreturn_32 #define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn +#endif #endif /* CONFIG_COMPAT && ! already defined */ #define __NR_seccomp_read __NR_read _ Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are origin.patch arm-factor-out-mmap-aslr-into-mmap_rnd.patch x86-standardize-mmap_rnd-usage.patch arm64-standardize-mmap_rnd-usage.patch arm64-standardize-mmap_rnd-usage-v4.patch mips-extract-logic-for-mmap_rnd.patch mips-extract-logic-for-mmap_rnd-v4.patch powerpc-standardize-mmap_rnd-usage.patch powerpc-standardize-mmap_rnd-usage-v4.patch s390-standardize-mmap_rnd-usage.patch mm-expose-arch_mmap_rnd-when-available.patch s390-redefine-randomize_et_dyn-for-elf_et_dyn_base.patch mm-split-et_dyn-aslr-from-mmap-aslr.patch mm-fold-arch_randomize_brk-into-arch_has_elf_randomize.patch lib-vsprintf-add-%pt-format-specifier.patch seccomp-allow-compat-sigreturn-overrides.patch arm-use-asm-generic-for-seccomph.patch microblaze-use-asm-generic-for-seccomph.patch mips-switch-to-using-asm-generic-for-seccomph.patch parisc-switch-to-using-asm-generic-for-seccomph.patch powerpc-switch-to-using-asm-generic-for-seccomph.patch sparc-switch-to-using-asm-generic-for-seccomph.patch x86-switch-to-using-asm-generic-for-seccomph.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html