From patchwork Wed Nov 6 10:25:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 21378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B752720DB9 for ; Wed, 6 Nov 2013 10:26:32 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id uy5sf31789373obc.7 for ; Wed, 06 Nov 2013 02:26:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=tLMIes3tcEXkdxlUYypgyiMum+pJpCtkmne+kKWG+ik=; b=IVE0PvpVMD3+G4w/oa6xEY630txGFtohTwORQg1J1Dqds19eKmGrrw4zJm+dJbqMvp 1G10BEPIwuEVzIu1s6eJm6oaAUfHWrGfAh/+gkyYyyDzfvLPmxcbICZR4eUnciByXTYj Fjd6aJmztlIWJTKv5yKOhlEeZSluvAsREBPt6OoUciynHLqhYF4Stfsbi4k4G2I4S7bM JA98MxY2iBTNan3sXoO/cqz7/73bJUSIr5u692XjX69xjuTcOYqAnNLkPq8DPKt32OiT 95NMb9f+IwJ++cnMK1vsHDNCDc6Eioizw3xf6/QlxjNlC0xoSt8kFhCIilRIAzNpcb96 nHFg== X-Gm-Message-State: ALoCoQnhJ3qwZIlkuwg4Ea2/9GdalUce2nJTVUTgzmeKVU6XONQBnPuDid7KCeI8ky298XTbUJet X-Received: by 10.50.127.138 with SMTP id ng10mr9177520igb.1.1383733592288; Wed, 06 Nov 2013 02:26:32 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.13.9 with SMTP id d9ls587061qec.26.gmail; Wed, 06 Nov 2013 02:26:32 -0800 (PST) X-Received: by 10.52.165.131 with SMTP id yy3mr1475285vdb.25.1383733592168; Wed, 06 Nov 2013 02:26:32 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id ug9si8178193vcb.107.2013.11.06.02.26.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:26:32 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id g10so3312506vbg.30 for ; Wed, 06 Nov 2013 02:26:32 -0800 (PST) X-Received: by 10.58.207.76 with SMTP id lu12mr1809250vec.30.1383733592104; Wed, 06 Nov 2013 02:26:32 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp273735vcz; Wed, 6 Nov 2013 02:26:31 -0800 (PST) X-Received: by 10.68.250.196 with SMTP id ze4mr2545885pbc.144.1383733591258; Wed, 06 Nov 2013 02:26:31 -0800 (PST) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by mx.google.com with ESMTPS id ai2si16908235pad.175.2013.11.06.02.26.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:26:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.171 is neither permitted nor denied by best guess record for domain of takahiro.akashi@linaro.org) client-ip=209.85.192.171; Received: by mail-pd0-f171.google.com with SMTP id w10so10000284pde.30 for ; Wed, 06 Nov 2013 02:26:30 -0800 (PST) X-Received: by 10.67.1.101 with SMTP id bf5mr3196163pad.50.1383733590554; Wed, 06 Nov 2013 02:26:30 -0800 (PST) Received: from localhost.localdomain (KD182249092064.au-net.ne.jp. [182.249.92.64]) by mx.google.com with ESMTPSA id qz9sm40405465pbc.3.2013.11.06.02.26.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:26:29 -0800 (PST) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org, linux-audit@redhat.com Cc: linaro-kernel@lists.linaro.org, patches@linaro.org, AKASHI Takahiro Subject: [PATCH 2/4] arm64: Add audit support Date: Wed, 6 Nov 2013 19:25:44 +0900 Message-Id: <1383733546-2846-3-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1383733546-2846-1-git-send-email-takahiro.akashi@linaro.org> References: <1383733546-2846-1-git-send-email-takahiro.akashi@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , --- arch/arm64/Kconfig | 3 ++ arch/arm64/include/asm/ptrace.h | 5 ++++ arch/arm64/include/asm/syscall.h | 18 ++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/audit.c | 59 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 arch/arm64/kernel/audit.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c044548..263c10b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -46,6 +46,9 @@ config 64BIT config ARCH_PHYS_ADDR_T_64BIT def_bool y +config AUDIT_ARCH + def_bool y + config MMU def_bool y diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 0dacbbf..964f4f6 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -133,6 +133,11 @@ struct pt_regs { #define user_stack_pointer(regs) \ ((regs)->sp) +static inline unsigned long regs_return_value(struct pt_regs *regs) +{ + return regs->regs[0]; +} + /* * Are the current registers suitable for user mode? (used to maintain * security in signal handlers) diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 89c047f..03040ac 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -16,7 +16,10 @@ #ifndef __ASM_SYSCALL_H #define __ASM_SYSCALL_H +#include #include +#include +#include static inline int syscall_get_nr(struct task_struct *task, @@ -98,4 +101,19 @@ static inline void syscall_set_arguments(struct task_struct *task, memcpy(®s->regs[i], args, n * sizeof(args[0])); } +static inline int syscall_get_arch(struct task_struct *task, + struct pt_regs *regs) +{ +#ifdef CONFIG_COMPAT + if (is_compat_thread(task_thread_info(task))) + return AUDIT_ARCH_ARM; /* FIXME: big endian? */ +#endif + +#ifdef __AARCH64EB__ + return AUDIT_ARCH_AARCH64EB; +#else + return AUDIT_ARCH_AARCH64; +#endif +} + #endif /* __ASM_SYSCALL_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 7b4b564..3abab29 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -11,6 +11,7 @@ arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ sys.o stacktrace.o time.o traps.o io.o vdso.o \ hyp-stub.o psci.o +arm64-obj-$(CONFIG_AUDIT) += audit.o arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o diff --git a/arch/arm64/kernel/audit.c b/arch/arm64/kernel/audit.c new file mode 100644 index 0000000..9aab2b3 --- /dev/null +++ b/arch/arm64/kernel/audit.c @@ -0,0 +1,59 @@ +#include +#include +#include + +static unsigned dir_class[] = { +#include +~0U +}; + +static unsigned read_class[] = { +#include +~0U +}; + +static unsigned write_class[] = { +#include +~0U +}; + +static unsigned chattr_class[] = { +#include +~0U +}; + +static unsigned signal_class[] = { +#include +~0U +}; + +int audit_classify_arch(int arch) +{ + return 0; /* native */ +} + +/* AUTH_PERM support */ +int audit_classify_syscall(int abi, unsigned syscall) +{ + switch(syscall) { + case __NR_openat: + return 3; + case __NR_execve: + return 5; + default: + return 0; /* native */ + } +} + +static int __init audit_classes_init(void) +{ + audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); + audit_register_class(AUDIT_CLASS_READ, read_class); + audit_register_class(AUDIT_CLASS_WRITE, write_class); + audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); + audit_register_class(AUDIT_CLASS_SIGNAL, signal_class); + + return 0; +} + +__initcall(audit_classes_init);