linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: viro@zeniv.linux.org.uk, eparis@redhat.com, rgb@redhat.com,
	catalin.marinas@arm.com, will.deacon@arm.com
Cc: dsaxena@linaro.org, arndb@arndb.de,
	linux-arm-kernel@lists.infradead.org,
	linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org,
	linux-audit@redhat.com,
	AKASHI Takahiro <takahiro.akashi@linaro.org>
Subject: [PATCH v5 2/3] arm64: Add audit support
Date: Tue, 25 Feb 2014 18:18:53 +0900	[thread overview]
Message-ID: <1393319934-2810-3-git-send-email-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <1393319934-2810-1-git-send-email-takahiro.akashi@linaro.org>

On AArch64, audit is supported through generic lib/audit.c and
compat_audit.c, and so this patch adds arch specific definitions required.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by Will Deacon <will.deacon@arm.com>
Acked-by: Richard Guy Briggs <rgb@redhat.com>
---
 arch/arm64/Kconfig               |    1 +
 arch/arm64/include/asm/syscall.h |   15 +++++++++++++++
 include/uapi/linux/audit.h       |    1 +
 3 files changed, 17 insertions(+)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 27bbcfc..aa47548 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -25,6 +25,7 @@ config ARM64
 	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select HARDIRQS_SW_RESEND
+	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_ARCH_JUMP_LABEL
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_DEBUG_BUGVERBOSE
diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index 70ba9d4..6900183 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -16,7 +16,9 @@
 #ifndef __ASM_SYSCALL_H
 #define __ASM_SYSCALL_H
 
+#include <linux/audit.h>
 #include <linux/err.h>
+#include <asm/compat.h>
 
 
 static inline int syscall_get_nr(struct task_struct *task,
@@ -104,4 +106,17 @@ static inline void syscall_set_arguments(struct task_struct *task,
 	memcpy(&regs->regs[i], args, n * sizeof(args[0]));
 }
 
+/*
+ * We don't care about endianness (__AUDIT_ARCH_LE bit) here because
+ * AArch64 has the same system calls both on little- and big- endian.
+ */
+static inline int syscall_get_arch(struct task_struct *task,
+				   struct pt_regs *regs)
+{
+	if (is_compat_thread(task_thread_info(task)))
+		return AUDIT_ARCH_ARM;
+
+	return AUDIT_ARCH_AARCH64;
+}
+
 #endif	/* __ASM_SYSCALL_H */
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 624df43..aa86fab 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -333,6 +333,7 @@ enum {
 /* distinguish syscall tables */
 #define __AUDIT_ARCH_64BIT 0x80000000
 #define __AUDIT_ARCH_LE	   0x40000000
+#define AUDIT_ARCH_AARCH64	(EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ALPHA	(EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARM		(EM_ARM|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_ARMEB	(EM_ARM)
-- 
1.7.9.5


  parent reply	other threads:[~2014-02-25  9:19 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1383733546-2846-1-git-send-email-takahiro.akashi@linaro.org>
2014-01-17  8:13 ` [PATCH v2 0/6] arm64: Add audit support AKASHI Takahiro
2014-01-17  8:13   ` [PATCH v2 1/6] audit: Enable arm64 support AKASHI Takahiro
2014-01-23 14:18     ` Catalin Marinas
2014-01-27  5:12       ` AKASHI Takahiro
2014-01-27 14:49         ` Catalin Marinas
2014-01-29 20:21         ` Richard Guy Briggs
2014-01-29 22:36           ` Richard Guy Briggs
2014-02-03  5:59             ` AKASHI Takahiro
2014-02-03 16:06               ` Richard Guy Briggs
2014-02-04 16:25                 ` Richard Guy Briggs
2014-02-03  6:00             ` [PATCH] audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL AKASHI Takahiro
2014-02-25  9:16               ` [PATCH v2 0/1] " AKASHI Takahiro
2014-02-25  9:16                 ` [PATCH v2 1/1] " AKASHI Takahiro
2014-02-25 15:25                   ` Richard Guy Briggs
2014-02-25 17:40                   ` Matt Turner
2014-02-26 12:31                   ` Michael Ellerman
2014-01-17  8:13   ` [PATCH v2 2/6] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-01-17  8:13   ` [PATCH v2 3/6] arm64: Add audit support AKASHI Takahiro
2014-01-17  8:13   ` [PATCH v2 4/6] arm64: audit: Add 32-bit (compat) syscall support AKASHI Takahiro
2014-01-17 16:46     ` Will Deacon
2014-01-20  5:23       ` AKASHI Takahiro
2014-01-17  8:13   ` [PATCH v2 5/6] arm64: audit: Add makefile rule to create unistd_32.h for compat syscalls AKASHI Takahiro
2014-01-23 14:53     ` Catalin Marinas
2014-01-27  6:13       ` AKASHI Takahiro
2014-01-17  8:13   ` [PATCH v2 6/6] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-01-23 14:56     ` Catalin Marinas
2014-01-17 19:44   ` [PATCH v2 0/6] arm64: Add audit support Richard Guy Briggs
2014-02-03  6:56   ` [PATCH v3 0/3] " AKASHI Takahiro
2014-02-03  6:56     ` [PATCH v3 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-04 17:30       ` Will Deacon
2014-02-03  6:56     ` [PATCH v3 2/3] arm64: Add audit support AKASHI Takahiro
2014-02-04 17:30       ` Will Deacon
2014-02-03  6:56     ` [PATCH v3 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-04 17:31       ` Will Deacon
2014-02-05  1:54         ` AKASHI Takahiro
2014-02-07 10:07           ` [PATCH] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-02-11 13:49             ` Richard Guy Briggs
2014-02-17 17:35             ` Will Deacon
2014-02-19 11:53               ` AKASHI Takahiro
2014-02-25  9:14             ` [PATCH v2 0/1] " AKASHI Takahiro
2014-02-25  9:14               ` [PATCH v2 1/1] " AKASHI Takahiro
2014-02-25 15:00                 ` Will Deacon
2014-02-26  2:00                   ` AKASHI Takahiro
2014-02-26 11:25                     ` Will Deacon
2014-02-27  1:33                       ` AKASHI Takahiro
2014-02-28  5:14               ` [PATCH v3 0/2] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-02-28  5:14                 ` [PATCH v3 1/2] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-02-28 15:57                   ` Will Deacon
2014-02-28  5:14                 ` [PATCH v3 2/2] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-13 10:11                 ` [PATCH v4 0/3] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-03-13 10:11                   ` [PATCH v4 1/3] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-03-13 18:28                     ` Will Deacon
2014-03-13 10:11                   ` [PATCH v4 2/3] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-03-13 18:41                     ` Will Deacon
2014-03-14 16:51                       ` AKASHI Takahiro
2014-03-13 10:11                   ` [PATCH v4 3/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-15  5:39                   ` [PATCH v5 0/4] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-03-15  5:39                     ` [PATCH v5 1/4] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-03-15  5:39                     ` [PATCH v5 2/4] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-03-16 19:46                       ` Richard Guy Briggs
2014-04-16 13:27                       ` Will Deacon
2014-04-28  9:58                         ` AKASHI Takahiro
2014-03-15  5:39                     ` [PATCH v5 3/4] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-15  5:39                     ` [PATCH v5 4/4] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-03-16 19:48                       ` Richard Guy Briggs
2014-04-16 13:29                       ` Will Deacon
2014-04-30  9:51                     ` [PATCH v6 0/4] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-04-30  9:51                       ` [PATCH v6 1/4] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-04-30  9:51                       ` [PATCH v6 2/4] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-04-30  9:51                       ` [PATCH v6 3/4] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-04-30  9:51                       ` [PATCH v6 4/4] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-05-12 15:52                       ` [PATCH v6 0/4] arm64: prerequisites for audit and ftrace Catalin Marinas
2014-02-07 10:10     ` [PATCH v4 0/3] arm64: Add audit support AKASHI Takahiro
2014-02-07 10:10       ` [PATCH v4 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-07 10:10       ` [PATCH v4 2/3] arm64: Add audit support AKASHI Takahiro
2014-02-07 10:10       ` [PATCH v4 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-17 17:42         ` Will Deacon
2014-02-11 13:51       ` [PATCH v4 0/3] arm64: Add audit support Richard Guy Briggs
2014-02-25  9:18       ` [PATCH v5 " AKASHI Takahiro
2014-02-25  9:18         ` [PATCH v5 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-25  9:18         ` AKASHI Takahiro [this message]
2014-02-25  9:18         ` [PATCH v5 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-28  5:17         ` [PATCH v6 0/2] arm64: Add audit support AKASHI Takahiro
2014-02-28  5:17           ` [PATCH v6 1/2] " AKASHI Takahiro
2014-03-05  2:50             ` Richard Guy Briggs
2014-03-06  2:21               ` AKASHI Takahiro
2014-02-28  5:17           ` [PATCH v6 2/2] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-28 16:15             ` Will Deacon
2014-02-28 20:45               ` Richard Guy Briggs
2014-03-06  2:10               ` AKASHI Takahiro
2014-03-06  2:55                 ` Richard Guy Briggs
2014-03-13 10:16           ` [PATCH v7 0/2] arm64: Add audit support AKASHI Takahiro
2014-03-13 10:16             ` [PATCH v7 1/2] " AKASHI Takahiro
2014-03-13 10:16             ` [PATCH v7 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() AKASHI Takahiro
2014-03-13 18:43               ` Will Deacon
2014-03-15  5:49             ` [PATCH_v8 0/2] arm64: Add audit support AKASHI Takahiro
2014-03-15  5:49               ` [PATCH_v8 1/2] " AKASHI Takahiro
2014-03-15  5:49               ` [PATCH_v8 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() AKASHI Takahiro
2014-04-16 11:30                 ` Will Deacon
2014-04-28  9:55                   ` AKASHI Takahiro
2014-04-11 21:37               ` [PATCH_v8 0/2] arm64: Add audit support Don Dutile
2014-04-28  9:51                 ` AKASHI Takahiro
2014-04-28 22:25                   ` Don Dutile
2014-04-30  9:57               ` [PATCH v9 " AKASHI Takahiro
2014-04-30  9:57                 ` [PATCH v9 1/2] " AKASHI Takahiro
2014-04-30  9:57                 ` [PATCH v9 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() AKASHI Takahiro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393319934-2810-3-git-send-email-takahiro.akashi@linaro.org \
    --to=takahiro.akashi@linaro.org \
    --cc=arndb@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=dsaxena@linaro.org \
    --cc=eparis@redhat.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-audit@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rgb@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).