Re: [PATCH] seccomp: switch to using asm-generic for seccomp.h

2015-02-27 Thread Stephen Rothwell 
Hi Kees,

On Fri, 27 Feb 2015 16:52:29 -0800 Kees Cook keesc...@chromium.org wrote:

 diff --git a/arch/arm/include/asm/seccomp.h b/arch/arm/include/asm/seccomp.h
 index 52b156b341f5..66ca6a30bf5c 100644
 --- a/arch/arm/include/asm/seccomp.h
 +++ b/arch/arm/include/asm/seccomp.h
 @@ -1,11 +1 @@
 -#ifndef _ASM_ARM_SECCOMP_H
 -#define _ASM_ARM_SECCOMP_H
 -
 -#include linux/unistd.h
 -
 -#define __NR_seccomp_read __NR_read
 -#define __NR_seccomp_write __NR_write
 -#define __NR_seccomp_exit __NR_exit
 -#define __NR_seccomp_sigreturn __NR_rt_sigreturn
 -
 -#endif /* _ASM_ARM_SECCOMP_H */
 +#include asm-generic/seccomp.h

I think that these cases (where you replace the file by a stub that
just include asm-generic/seccomp.h) can be replaced by removing the
file completely and adding

generic-y = seccomp.h

to ARCH/include/asm/Kbuild

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpIk__jP4F6y.pgp
Description: OpenPGP digital signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH] seccomp: switch to using asm-generic for seccomp.h

2015-02-27 Thread Kees Cook 
On Fri, Feb 27, 2015 at 5:36 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
 Hi Kees,

 On Fri, 27 Feb 2015 16:52:29 -0800 Kees Cook keesc...@chromium.org wrote:

 diff --git a/arch/arm/include/asm/seccomp.h b/arch/arm/include/asm/seccomp.h
 index 52b156b341f5..66ca6a30bf5c 100644
 --- a/arch/arm/include/asm/seccomp.h
 +++ b/arch/arm/include/asm/seccomp.h
 @@ -1,11 +1 @@
 -#ifndef _ASM_ARM_SECCOMP_H
 -#define _ASM_ARM_SECCOMP_H
 -
 -#include linux/unistd.h
 -
 -#define __NR_seccomp_read __NR_read
 -#define __NR_seccomp_write __NR_write
 -#define __NR_seccomp_exit __NR_exit
 -#define __NR_seccomp_sigreturn __NR_rt_sigreturn
 -
 -#endif /* _ASM_ARM_SECCOMP_H */
 +#include asm-generic/seccomp.h

 I think that these cases (where you replace the file by a stub that
 just include asm-generic/seccomp.h) can be replaced by removing the
 file completely and adding

 generic-y = seccomp.h

 to ARCH/include/asm/Kbuild

Ah-ha! I thought total removal was possible, but I lacked the Kbuild
piece. There are a lot of arch/ headers that are just the one line.
Maybe I should send a another patch to clean up those?

-Kees

-- 
Kees Cook
Chrome OS Security
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH] seccomp: switch to using asm-generic for seccomp.h

2015-02-27 Thread Kees Cook 
Most architectures don't need to do anything special for the strict
seccomp syscall entries. Remove the redundant headers and reduce the
others.

Signed-off-by: Kees Cook keesc...@chromium.org
---
 arch/arm/include/asm/seccomp.h  | 12 +---
 arch/microblaze/include/asm/seccomp.h   | 17 +
 arch/mips/include/asm/seccomp.h |  7 ++-
 arch/parisc/include/asm/seccomp.h   | 17 +
 arch/powerpc/include/asm/seccomp.h  |  1 +
 arch/powerpc/include/uapi/asm/Kbuild|  1 -
 arch/powerpc/include/uapi/asm/seccomp.h | 16 
 arch/s390/include/asm/seccomp.h | 17 +
 arch/sh/include/asm/seccomp.h   | 11 +--
 arch/sparc/include/asm/seccomp.h| 16 +---
 arch/x86/include/asm/seccomp.h  | 21 ++---
 arch/x86/include/asm/seccomp_32.h   | 11 ---
 arch/x86/include/asm/seccomp_64.h   | 17 -
 13 files changed, 27 insertions(+), 137 deletions(-)
 create mode 100644 arch/powerpc/include/asm/seccomp.h
 delete mode 100644 arch/powerpc/include/uapi/asm/seccomp.h
 delete mode 100644 arch/x86/include/asm/seccomp_32.h
 delete mode 100644 arch/x86/include/asm/seccomp_64.h

diff --git a/arch/arm/include/asm/seccomp.h b/arch/arm/include/asm/seccomp.h
index 52b156b341f5..66ca6a30bf5c 100644
--- a/arch/arm/include/asm/seccomp.h
+++ b/arch/arm/include/asm/seccomp.h
@@ -1,11 +1 @@
-#ifndef _ASM_ARM_SECCOMP_H
-#define _ASM_ARM_SECCOMP_H
-
-#include linux/unistd.h
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#endif /* _ASM_ARM_SECCOMP_H */
+#include asm-generic/seccomp.h
diff --git a/arch/microblaze/include/asm/seccomp.h 
b/arch/microblaze/include/asm/seccomp.h
index 0d912758a0d7..66ca6a30bf5c 100644
--- a/arch/microblaze/include/asm/seccomp.h
+++ b/arch/microblaze/include/asm/seccomp.h
@@ -1,16 +1 @@
-#ifndef _ASM_MICROBLAZE_SECCOMP_H
-#define _ASM_MICROBLAZE_SECCOMP_H
-
-#include linux/unistd.h
-
-#define __NR_seccomp_read  __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit  __NR_exit
-#define __NR_seccomp_sigreturn __NR_sigreturn
-
-#define __NR_seccomp_read_32   __NR_read
-#define __NR_seccomp_write_32  __NR_write
-#define __NR_seccomp_exit_32   __NR_exit
-#define __NR_seccomp_sigreturn_32  __NR_sigreturn
-
-#endif /* _ASM_MICROBLAZE_SECCOMP_H */
+#include asm-generic/seccomp.h
diff --git a/arch/mips/include/asm/seccomp.h b/arch/mips/include/asm/seccomp.h
index f29c75cf83c6..1d8a2e2c75c1 100644
--- a/arch/mips/include/asm/seccomp.h
+++ b/arch/mips/include/asm/seccomp.h
@@ -2,11 +2,6 @@
 
 #include linux/unistd.h
 
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
 /*
  * Kludge alert:
  *
@@ -29,4 +24,6 @@
 
 #endif /* CONFIG_MIPS32_O32 */
 
+#include asm-generic/seccomp.h
+
 #endif /* __ASM_SECCOMP_H */
diff --git a/arch/parisc/include/asm/seccomp.h 
b/arch/parisc/include/asm/seccomp.h
index 015f7887aa29..66ca6a30bf5c 100644
--- a/arch/parisc/include/asm/seccomp.h
+++ b/arch/parisc/include/asm/seccomp.h
@@ -1,16 +1 @@
-#ifndef _ASM_PARISC_SECCOMP_H
-#define _ASM_PARISC_SECCOMP_H
-
-#include linux/unistd.h
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#define __NR_seccomp_read_32 __NR_read
-#define __NR_seccomp_write_32 __NR_write
-#define __NR_seccomp_exit_32 __NR_exit
-#define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn
-
-#endif /* _ASM_PARISC_SECCOMP_H */
+#include asm-generic/seccomp.h
diff --git a/arch/powerpc/include/asm/seccomp.h 
b/arch/powerpc/include/asm/seccomp.h
new file mode 100644
index ..66ca6a30bf5c
--- /dev/null
+++ b/arch/powerpc/include/asm/seccomp.h
@@ -0,0 +1 @@
+#include asm-generic/seccomp.h
diff --git a/arch/powerpc/include/uapi/asm/Kbuild 
b/arch/powerpc/include/uapi/asm/Kbuild
index 7a3f795ac218..79c4068be278 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -25,7 +25,6 @@ header-y += posix_types.h
 header-y += ps3fb.h
 header-y += ptrace.h
 header-y += resource.h
-header-y += seccomp.h
 header-y += sembuf.h
 header-y += setup.h
 header-y += shmbuf.h
diff --git a/arch/powerpc/include/uapi/asm/seccomp.h 
b/arch/powerpc/include/uapi/asm/seccomp.h
deleted file mode 100644
index 00c1d9133cfe..
--- a/arch/powerpc/include/uapi/asm/seccomp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ASM_POWERPC_SECCOMP_H
-#define _ASM_POWERPC_SECCOMP_H
-
-#include linux/unistd.h
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn