lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v17 06/15] arch/x86: add syscall_get_arch to syscall.h
    Date
    Add syscall_get_arch() to export the current AUDIT_ARCH_* based on system call
    entry path.

    Reviewed-by: H. Peter Anvin <hpa@zytor.com>
    Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
    Signed-off-by: Will Drewry <wad@chromium.org>

    v17: rebase and reviewed-by
    v14: rebase/nochanges
    v13: rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc
    ---
    arch/x86/include/asm/syscall.h | 23 +++++++++++++++++++++++
    1 files changed, 23 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
    index d962e56..1d713e4 100644
    --- a/arch/x86/include/asm/syscall.h
    +++ b/arch/x86/include/asm/syscall.h
    @@ -13,6 +13,7 @@
    #ifndef _ASM_X86_SYSCALL_H
    #define _ASM_X86_SYSCALL_H

    +#include <linux/audit.h>
    #include <linux/sched.h>
    #include <linux/err.h>
    #include <asm/asm-offsets.h> /* For NR_syscalls */
    @@ -87,6 +88,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
    memcpy(&regs->bx + i, args, n * sizeof(args[0]));
    }

    +static inline int syscall_get_arch(struct task_struct *task,
    + struct pt_regs *regs)
    +{
    + return AUDIT_ARCH_I386;
    +}
    +
    #else /* CONFIG_X86_64 */

    static inline void syscall_get_arguments(struct task_struct *task,
    @@ -211,6 +218,22 @@ static inline void syscall_set_arguments(struct task_struct *task,
    }
    }

    +static inline int syscall_get_arch(struct task_struct *task,
    + struct pt_regs *regs)
    +{
    +#ifdef CONFIG_IA32_EMULATION
    + /*
    + * TS_COMPAT is set for 32-bit syscall entries and then
    + * remains set until we return to user mode.
    + *
    + * TIF_IA32 tasks should always have TS_COMPAT set at
    + * system call time.
    + */
    + if (task_thread_info(task)->status & TS_COMPAT)
    + return AUDIT_ARCH_I386;
    +#endif
    + return AUDIT_ARCH_X86_64;
    +}
    #endif /* CONFIG_X86_32 */

    #endif /* _ASM_X86_SYSCALL_H */
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-03-29 22:05    [W:2.704 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site