From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755239AbbCCIaP (ORCPT ); Tue, 3 Mar 2015 03:30:15 -0500 Received: from mail-wg0-f45.google.com ([74.125.82.45]:40130 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753364AbbCCIaJ (ORCPT ); Tue, 3 Mar 2015 03:30:09 -0500 Date: Tue, 3 Mar 2015 09:30:02 +0100 From: Ingo Molnar To: Kees Cook Cc: Andrew Morton , AKASHI Takahiro , Russell King , Michal Simek , Ralf Baechle , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, "David S. Miller" , x86@kernel.org, Frederic Weisbecker , Peter Zijlstra , Stephen Rothwell , Laura Abbott , Will Deacon , Daniel Borkmann , Jesper Nilsson , James Hogan , linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] seccomp: switch to using asm-generic for seccomp.h Message-ID: <20150303083002.GA1207@gmail.com> References: <20150302231254.GA4857@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150302231254.GA4857@www.outflux.net> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Kees Cook wrote: > Most architectures don't need to do anything special for the strict > seccomp syscall entries. Remove the redundant headers and reduce the > others. > 19 files changed, 27 insertions(+), 137 deletions(-) Lovely cleanup factor. Just to make sure, are you sure the 32-bit details are identical across architectures? For example some architectures did this: > --- a/arch/microblaze/include/asm/seccomp.h > +++ /dev/null > @@ -1,16 +0,0 @@ > -#ifndef _ASM_MICROBLAZE_SECCOMP_H > -#define _ASM_MICROBLAZE_SECCOMP_H > - > -#include > - > -#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 others did this: > diff --git a/arch/x86/include/asm/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h > deleted file mode 100644 > index 84ec1bd161a5..000000000000 > --- a/arch/x86/include/asm/seccomp_64.h > +++ /dev/null > @@ -1,17 +0,0 @@ > -#ifndef _ASM_X86_SECCOMP_64_H > -#define _ASM_X86_SECCOMP_64_H > - > -#include > -#include > - > -#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_ia32_read > -#define __NR_seccomp_write_32 __NR_ia32_write > -#define __NR_seccomp_exit_32 __NR_ia32_exit > -#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn > - > -#endif /* _ASM_X86_SECCOMP_64_H */ While in yet another case you kept the syscall mappings: > --- a/arch/x86/include/asm/seccomp.h > +++ b/arch/x86/include/asm/seccomp.h > @@ -1,5 +1,20 @@ > +#ifndef _ASM_X86_SECCOMP_H > +#define _ASM_X86_SECCOMP_H > + > +#include > + > +#ifdef CONFIG_COMPAT > +#include > +#define __NR_seccomp_read_32 __NR_ia32_read > +#define __NR_seccomp_write_32 __NR_ia32_write > +#define __NR_seccomp_exit_32 __NR_ia32_exit > +#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn > +#endif > + > #ifdef CONFIG_X86_32 > -# include > -#else > -# include > +#define __NR_seccomp_sigreturn __NR_sigreturn > #endif > + > +#include > + > +#endif /* _ASM_X86_SECCOMP_H */ It might all be correct, but it's not obvious to me. Thanks, Ingo