From patchwork Fri Jul 4 07:28:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 33071 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75A3D20DCC for ; Fri, 4 Jul 2014 07:30:36 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id i13sf4350515veh.3 for ; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=upRusyxdjnOl6XznNpmr6MriXJxGZIvHn4BpQ9Aqtmw=; b=chlMzWumEyFpH5aOJYhUoi1s3bG5J+7f6xFWjbOzcV1dXJ8fMbifeKjOuFzY14G6g1 TWnH40e/otEHHvvvOxVhtOnTOYzFSvD6gGWZykJPOcbPjfTwrVvD8F3g1JiapzOFCaZ0 bbxe8HeEmyWcnqQsFuESCKv2Oq6OyzmhEkAhhc7D+MrWXY/O0pes0YB4bqsVcFj6D2kC TUK9Rt5S6VbXjc0RLdghJkw6kNdyO+F+tH6hmBF3QaYTiqb33zGlypLQXaZvLFU3U/E/ CQApiVICO+uiOVZaxpBB13PT7e3jax6S3Ge+qPZV/GwrmG1wfGfXcY0kIOBIAEUlKdnK IWnA== X-Gm-Message-State: ALoCoQmdbPY/Lhy2ZSKEJYHQPW263Ln9P4RvuoNAlp0kWGXDEQEv7Qpy7t9/0KZvKi6JMc257IUe X-Received: by 10.58.172.5 with SMTP id ay5mr4899057vec.37.1404459036270; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.198 with SMTP id m64ls779212qge.39.gmail; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) X-Received: by 10.52.116.194 with SMTP id jy2mr301464vdb.39.1404459036160; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id xe6si15222393vcb.28.2014.07.04.00.30.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Jul 2014 00:30:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id im17so1234202vcb.39 for ; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) X-Received: by 10.220.69.68 with SMTP id y4mr8288276vci.21.1404459036066; Fri, 04 Jul 2014 00:30:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp446054vcb; Fri, 4 Jul 2014 00:30:35 -0700 (PDT) X-Received: by 10.66.219.6 with SMTP id pk6mr9426878pac.9.1404459035118; Fri, 04 Jul 2014 00:30:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gn5si5004688pac.36.2014.07.04.00.30.34; Fri, 04 Jul 2014 00:30:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754032AbaGDHaS (ORCPT + 27 others); Fri, 4 Jul 2014 03:30:18 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:61193 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753674AbaGDHaM (ORCPT ); Fri, 4 Jul 2014 03:30:12 -0400 Received: by mail-pd0-f172.google.com with SMTP id w10so1560957pde.3 for ; Fri, 04 Jul 2014 00:30:11 -0700 (PDT) X-Received: by 10.68.191.138 with SMTP id gy10mr34296666pbc.169.1404459011319; Fri, 04 Jul 2014 00:30:11 -0700 (PDT) Received: from localhost.localdomain (KD182249080206.au-net.ne.jp. [182.249.80.206]) by mx.google.com with ESMTPSA id cj1sm151915331pac.40.2014.07.04.00.30.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jul 2014 00:30:10 -0700 (PDT) From: AKASHI Takahiro To: viro@zeniv.linux.org.uk, eparis@redhat.com, rgb@redhat.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: dsaxena@linaro.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com, AKASHI Takahiro Subject: [PATCH v10 2/3] arm64: Add audit support Date: Fri, 4 Jul 2014 16:28:30 +0900 Message-Id: <1404458911-8214-3-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404458911-8214-1-git-send-email-takahiro.akashi@linaro.org> References: <1404458911-8214-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On AArch64, audit is supported through generic lib/audit.c and compat_audit.c, and so this patch adds arch specific definitions required. Acked-by Will Deacon Acked-by: Richard Guy Briggs Signed-off-by: AKASHI Takahiro --- arch/arm64/Kconfig | 2 ++ arch/arm64/include/asm/syscall.h | 14 ++++++++++++++ include/uapi/linux/audit.h | 1 + 3 files changed, 17 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a474de34..3a18571 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -10,6 +10,7 @@ config ARM64 select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC + select AUDIT_ARCH_COMPAT_GENERIC select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK @@ -28,6 +29,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_KGDB select HAVE_ARCH_TRACEHOOK diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 383771e..709a574 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -16,6 +16,8 @@ #ifndef __ASM_SYSCALL_H #define __ASM_SYSCALL_H +#include +#include #include extern const void *sys_call_table[]; @@ -105,4 +107,16 @@ static inline void syscall_set_arguments(struct task_struct *task, memcpy(®s->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(void) +{ + if (is_compat_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 cf67147..3b9ff33 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -342,6 +342,7 @@ enum { #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)