| Message ID | 1395266643-3139-3-git-send-email-eparis@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Mar 19, 2014 at 3:04 PM, Eric Paris <eparis@redhat.com> wrote:
> For all arches which support audit implement syscall_get_arch()
support audit -- is that AUDIT_ARCH? If so, alpha gained support
recently, so I think this patch needs to handle alpha too?
On Wed, 2014-03-19 at 15:19 -0700, Matt Turner wrote: > On Wed, Mar 19, 2014 at 3:04 PM, Eric Paris <eparis@redhat.com> wrote: > > For all arches which support audit implement syscall_get_arch() > > support audit -- is that AUDIT_ARCH? If so, alpha gained support > recently, so I think this patch needs to handle alpha too? Absolutely right. I broke Alpha (in the next patch). Will fix. -Eric
On 14/03/19, Eric Paris wrote: > For all arches which support audit implement syscall_get_arch() > They are all pretty easy and straight forward, stolen from how the call > to audit_syscall_entry() determines the arch. > > Signed-off-by: Eric Paris <eparis@redhat.com> > Cc: linux-ia64@vger.kernel.org > Cc: microblaze-uclinux@itee.uq.edu.au > Cc: linux-mips@linux-mips.org > Cc: linux@lists.openrisc.net > Cc: linux-parisc@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org > Cc: sparclinux@vger.kernel.org Acked-by: Richard Guy Briggs <rgb@redhat.com> > --- > arch/ia64/include/asm/syscall.h | 6 ++++++ > arch/microblaze/include/asm/syscall.h | 5 +++++ > arch/mips/include/asm/syscall.h | 2 +- > arch/openrisc/include/asm/syscall.h | 5 +++++ > arch/parisc/include/asm/syscall.h | 11 +++++++++++ > arch/powerpc/include/asm/syscall.h | 12 ++++++++++++ > arch/sparc/include/asm/syscall.h | 8 ++++++++ > include/uapi/linux/audit.h | 1 + > 8 files changed, 49 insertions(+), 1 deletion(-) > > diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h > index a7ff1c6..1d0b875 100644 > --- a/arch/ia64/include/asm/syscall.h > +++ b/arch/ia64/include/asm/syscall.h > @@ -13,6 +13,7 @@ > #ifndef _ASM_SYSCALL_H > #define _ASM_SYSCALL_H 1 > > +#include <uapi/linux/audit.h> > #include <linux/sched.h> > #include <linux/err.h> > > @@ -79,4 +80,9 @@ static inline void syscall_set_arguments(struct task_struct *task, > > ia64_syscall_get_set_arguments(task, regs, i, n, args, 1); > } > + > +static inline int syscall_get_arch(void) > +{ > + return AUDIT_ARCH_IA64; > +} > #endif /* _ASM_SYSCALL_H */ > diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h > index 9bc4317..53cfaf3 100644 > --- a/arch/microblaze/include/asm/syscall.h > +++ b/arch/microblaze/include/asm/syscall.h > @@ -1,6 +1,7 @@ > #ifndef __ASM_MICROBLAZE_SYSCALL_H > #define __ASM_MICROBLAZE_SYSCALL_H > > +#include <uapi/linux/audit.h> > #include <linux/kernel.h> > #include <linux/sched.h> > #include <asm/ptrace.h> > @@ -99,4 +100,8 @@ static inline void syscall_set_arguments(struct task_struct *task, > asmlinkage long do_syscall_trace_enter(struct pt_regs *regs); > asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); > > +static inline int syscall_get_arch(void) > +{ > + return AUDIT_ARCH_MICROBLAZE; > +} > #endif /* __ASM_MICROBLAZE_SYSCALL_H */ > diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h > index fc556d8..992b6ab 100644 > --- a/arch/mips/include/asm/syscall.h > +++ b/arch/mips/include/asm/syscall.h > @@ -103,7 +103,7 @@ extern const unsigned long sysn32_call_table[]; > > static inline int syscall_get_arch(void) > { > - int arch = EM_MIPS; > + int arch = AUDIT_ARCH_MIPS; > #ifdef CONFIG_64BIT > arch |= __AUDIT_ARCH_64BIT; > #endif > diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/asm/syscall.h > index b752bb6..2db9f1c 100644 > --- a/arch/openrisc/include/asm/syscall.h > +++ b/arch/openrisc/include/asm/syscall.h > @@ -19,6 +19,7 @@ > #ifndef __ASM_OPENRISC_SYSCALL_H__ > #define __ASM_OPENRISC_SYSCALL_H__ > > +#include <uapi/linux/audit.h> > #include <linux/err.h> > #include <linux/sched.h> > > @@ -71,4 +72,8 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, > memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); > } > > +static inline int syscall_get_arch(void) > +{ > + return AUDIT_ARCH_OPENRISC; > +} > #endif > diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.h > index 8bdfd2c..a5eba95 100644 > --- a/arch/parisc/include/asm/syscall.h > +++ b/arch/parisc/include/asm/syscall.h > @@ -3,6 +3,8 @@ > #ifndef _ASM_PARISC_SYSCALL_H_ > #define _ASM_PARISC_SYSCALL_H_ > > +#include <uapi/linux/audit.h> > +#include <linux/compat.h> > #include <linux/err.h> > #include <asm/ptrace.h> > > @@ -37,4 +39,13 @@ static inline void syscall_get_arguments(struct task_struct *tsk, > } > } > > +static inline int syscall_get_arch(void) > +{ > + int arch = AUDIT_ARCH_PARISC; > +#ifdef CONFIG_64BIT > + if (!is_compat_task()) > + arch = AUDIT_ARCH_PARISC64; > +#endif > + return arch; > +} > #endif /*_ASM_PARISC_SYSCALL_H_*/ > diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h > index b54b2ad..4271544 100644 > --- a/arch/powerpc/include/asm/syscall.h > +++ b/arch/powerpc/include/asm/syscall.h > @@ -13,6 +13,8 @@ > #ifndef _ASM_SYSCALL_H > #define _ASM_SYSCALL_H 1 > > +#include <uapi/linux/audit.h> > +#include <linux/compat.h> > #include <linux/sched.h> > > /* ftrace syscalls requires exporting the sys_call_table */ > @@ -86,4 +88,14 @@ static inline void syscall_set_arguments(struct task_struct *task, > memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); > } > > +static inline int syscall_get_arch(void) > +{ > + int arch = AUDIT_ARCH_PPC; > + > +#ifdef CONFIG_PPC64 > + if (!is_32bit_task()) > + arch = AUDIT_ARCH_PPC64; > +#endif > + return arch; > +} > #endif /* _ASM_SYSCALL_H */ > diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h > index 025a02a..fed3d51 100644 > --- a/arch/sparc/include/asm/syscall.h > +++ b/arch/sparc/include/asm/syscall.h > @@ -1,9 +1,11 @@ > #ifndef __ASM_SPARC_SYSCALL_H > #define __ASM_SPARC_SYSCALL_H > > +#include <uapi/linux/audit.h> > #include <linux/kernel.h> > #include <linux/sched.h> > #include <asm/ptrace.h> > +#include <asm/thread_info.h> > > /* > * The syscall table always contains 32 bit pointers since we know that the > @@ -124,4 +126,10 @@ static inline void syscall_set_arguments(struct task_struct *task, > regs->u_regs[UREG_I0 + i + j] = args[j]; > } > > +static inline int syscall_get_arch(void) > +{ > + return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC > + : AUDIT_ARCH_SPARC64; > +} > + > #endif /* __ASM_SPARC_SYSCALL_H */ > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h > index 9af01d7..8496cfa 100644 > --- a/include/uapi/linux/audit.h > +++ b/include/uapi/linux/audit.h > @@ -343,6 +343,7 @@ enum { > #define AUDIT_ARCH_IA64 (EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) > #define AUDIT_ARCH_M32R (EM_M32R) > #define AUDIT_ARCH_M68K (EM_68K) > +#define AUDIT_ARCH_MICROBLAZE (EM_MICROBLAZE) > #define AUDIT_ARCH_MIPS (EM_MIPS) > #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) > #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) > -- > 1.8.5.3 > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit - RGB -- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
Hi Eric, [I just noticed that this turned up in linux-next ...] On Wed, 19 Mar 2014 18:04:02 -0400 Eric Paris <eparis@redhat.com> wrote: > > diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h > index b54b2ad..4271544 100644 > --- a/arch/powerpc/include/asm/syscall.h > +++ b/arch/powerpc/include/asm/syscall.h > @@ -13,6 +13,8 @@ > #ifndef _ASM_SYSCALL_H > #define _ASM_SYSCALL_H 1 > > +#include <uapi/linux/audit.h> > +#include <linux/compat.h> You don't need linux/compat.h, I think, but you do need to include linux/thread_info.h for is_32bit_task() below. > #include <linux/sched.h> > > /* ftrace syscalls requires exporting the sys_call_table */ > @@ -86,4 +88,14 @@ static inline void syscall_set_arguments(struct task_struct *task, > memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); > } > > +static inline int syscall_get_arch(void) > +{ > + int arch = AUDIT_ARCH_PPC; > + > +#ifdef CONFIG_PPC64 > + if (!is_32bit_task()) > + arch = AUDIT_ARCH_PPC64; > +#endif > + return arch; This could just be return is_32bit_task() ? AUDIT_ARCH_PPC : AUDIT_ARCH_PPC64; as is_32bit_task() is always defined (and is (1) for !CONFIG_PPC64).
diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h index a7ff1c6..1d0b875 100644 --- a/arch/ia64/include/asm/syscall.h +++ b/arch/ia64/include/asm/syscall.h @@ -13,6 +13,7 @@ #ifndef _ASM_SYSCALL_H #define _ASM_SYSCALL_H 1 +#include <uapi/linux/audit.h> #include <linux/sched.h> #include <linux/err.h> @@ -79,4 +80,9 @@ static inline void syscall_set_arguments(struct task_struct *task, ia64_syscall_get_set_arguments(task, regs, i, n, args, 1); } + +static inline int syscall_get_arch(void) +{ + return AUDIT_ARCH_IA64; +} #endif /* _ASM_SYSCALL_H */ diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h index 9bc4317..53cfaf3 100644 --- a/arch/microblaze/include/asm/syscall.h +++ b/arch/microblaze/include/asm/syscall.h @@ -1,6 +1,7 @@ #ifndef __ASM_MICROBLAZE_SYSCALL_H #define __ASM_MICROBLAZE_SYSCALL_H +#include <uapi/linux/audit.h> #include <linux/kernel.h> #include <linux/sched.h> #include <asm/ptrace.h> @@ -99,4 +100,8 @@ static inline void syscall_set_arguments(struct task_struct *task, asmlinkage long do_syscall_trace_enter(struct pt_regs *regs); asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); +static inline int syscall_get_arch(void) +{ + return AUDIT_ARCH_MICROBLAZE; +} #endif /* __ASM_MICROBLAZE_SYSCALL_H */ diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index fc556d8..992b6ab 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -103,7 +103,7 @@ extern const unsigned long sysn32_call_table[]; static inline int syscall_get_arch(void) { - int arch = EM_MIPS; + int arch = AUDIT_ARCH_MIPS; #ifdef CONFIG_64BIT arch |= __AUDIT_ARCH_64BIT; #endif diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/asm/syscall.h index b752bb6..2db9f1c 100644 --- a/arch/openrisc/include/asm/syscall.h +++ b/arch/openrisc/include/asm/syscall.h @@ -19,6 +19,7 @@ #ifndef __ASM_OPENRISC_SYSCALL_H__ #define __ASM_OPENRISC_SYSCALL_H__ +#include <uapi/linux/audit.h> #include <linux/err.h> #include <linux/sched.h> @@ -71,4 +72,8 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); } +static inline int syscall_get_arch(void) +{ + return AUDIT_ARCH_OPENRISC; +} #endif diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.h index 8bdfd2c..a5eba95 100644 --- a/arch/parisc/include/asm/syscall.h +++ b/arch/parisc/include/asm/syscall.h @@ -3,6 +3,8 @@ #ifndef _ASM_PARISC_SYSCALL_H_ #define _ASM_PARISC_SYSCALL_H_ +#include <uapi/linux/audit.h> +#include <linux/compat.h> #include <linux/err.h> #include <asm/ptrace.h> @@ -37,4 +39,13 @@ static inline void syscall_get_arguments(struct task_struct *tsk, } } +static inline int syscall_get_arch(void) +{ + int arch = AUDIT_ARCH_PARISC; +#ifdef CONFIG_64BIT + if (!is_compat_task()) + arch = AUDIT_ARCH_PARISC64; +#endif + return arch; +} #endif /*_ASM_PARISC_SYSCALL_H_*/ diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index b54b2ad..4271544 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -13,6 +13,8 @@ #ifndef _ASM_SYSCALL_H #define _ASM_SYSCALL_H 1 +#include <uapi/linux/audit.h> +#include <linux/compat.h> #include <linux/sched.h> /* ftrace syscalls requires exporting the sys_call_table */ @@ -86,4 +88,14 @@ static inline void syscall_set_arguments(struct task_struct *task, memcpy(®s->gpr[3 + i], args, n * sizeof(args[0])); } +static inline int syscall_get_arch(void) +{ + int arch = AUDIT_ARCH_PPC; + +#ifdef CONFIG_PPC64 + if (!is_32bit_task()) + arch = AUDIT_ARCH_PPC64; +#endif + return arch; +} #endif /* _ASM_SYSCALL_H */ diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h index 025a02a..fed3d51 100644 --- a/arch/sparc/include/asm/syscall.h +++ b/arch/sparc/include/asm/syscall.h @@ -1,9 +1,11 @@ #ifndef __ASM_SPARC_SYSCALL_H #define __ASM_SPARC_SYSCALL_H +#include <uapi/linux/audit.h> #include <linux/kernel.h> #include <linux/sched.h> #include <asm/ptrace.h> +#include <asm/thread_info.h> /* * The syscall table always contains 32 bit pointers since we know that the @@ -124,4 +126,10 @@ static inline void syscall_set_arguments(struct task_struct *task, regs->u_regs[UREG_I0 + i + j] = args[j]; } +static inline int syscall_get_arch(void) +{ + return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC + : AUDIT_ARCH_SPARC64; +} + #endif /* __ASM_SPARC_SYSCALL_H */ diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 9af01d7..8496cfa 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -343,6 +343,7 @@ enum { #define AUDIT_ARCH_IA64 (EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) #define AUDIT_ARCH_M32R (EM_M32R) #define AUDIT_ARCH_M68K (EM_68K) +#define AUDIT_ARCH_MICROBLAZE (EM_MICROBLAZE) #define AUDIT_ARCH_MIPS (EM_MIPS) #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT)
For all arches which support audit implement syscall_get_arch() They are all pretty easy and straight forward, stolen from how the call to audit_syscall_entry() determines the arch. Signed-off-by: Eric Paris <eparis@redhat.com> Cc: linux-ia64@vger.kernel.org Cc: microblaze-uclinux@itee.uq.edu.au Cc: linux-mips@linux-mips.org Cc: linux@lists.openrisc.net Cc: linux-parisc@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: sparclinux@vger.kernel.org --- arch/ia64/include/asm/syscall.h | 6 ++++++ arch/microblaze/include/asm/syscall.h | 5 +++++ arch/mips/include/asm/syscall.h | 2 +- arch/openrisc/include/asm/syscall.h | 5 +++++ arch/parisc/include/asm/syscall.h | 11 +++++++++++ arch/powerpc/include/asm/syscall.h | 12 ++++++++++++ arch/sparc/include/asm/syscall.h | 8 ++++++++ include/uapi/linux/audit.h | 1 + 8 files changed, 49 insertions(+), 1 deletion(-)