From patchwork Sun Aug 17 14:26:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 4731291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 878B59F344 for ; Sun, 17 Aug 2014 14:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5F902012E for ; Sun, 17 Aug 2014 14:34:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 043EB2012D for ; Sun, 17 Aug 2014 14:34:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XJ1Qb-00081l-W2; Sun, 17 Aug 2014 14:27:25 +0000 Received: from mezzanine.sirena.org.uk ([2400:8900::f03c:91ff:fedb:4f4]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XJ1QY-000809-1u for linux-arm-kernel@lists.infradead.org; Sun, 17 Aug 2014 14:27:22 +0000 Received: from 216-80-70-240.c3-0.alc-ubr4.chi-alc.il.cable.rcn.com ([216.80.70.240] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XJ1Pt-0006SZ-Su; Sun, 17 Aug 2014 14:26:43 +0000 Received: from broonie by finisterre with local (Exim 4.84_RC1) (envelope-from ) id 1XJ1Pq-00083E-WB; Sun, 17 Aug 2014 09:26:39 -0500 From: Mark Brown To: Eric Paris , Richard Guy Briggs Date: Sun, 17 Aug 2014 09:26:37 -0500 Message-Id: <1408285597-30913-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.1.0.rc1 X-SA-Exim-Connect-IP: 216.80.70.240 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: [PATCH] arm64: audit: Fix build for audit changes X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140817_072722_223640_2EBB0E5A X-CRM114-Status: GOOD ( 11.89 ) X-Spam-Score: -0.7 (/) Cc: linaro-kernel@lists.linaro.org, Mark Brown , Catalin Marinas , Will Deacon , linux-audit@redhat.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Brown Commit 3efe33f5d2 (audit: x86: drop arch from __audit_syscall_entry() interface) removed the arch parameter from __audit_syscall_entry() and updated the only current user in mainline but this breaks the ARMv8 audit code that has been added in -next. Fix this by making the equivalent update to ARMv8. Signed-off-by: Mark Brown Acked-by: Catalin Marinas --- Now -rc1 is out this should be applied to the audit tree (or squashed into the commit above) - the arm64 audit support is in mainline now and -next is failing to build arm64 due to this. arch/arm64/kernel/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 0310811..159251f 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1116,8 +1116,8 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) trace_sys_enter(regs, regs->syscallno); #ifdef CONFIG_AUDITSYSCALL - audit_syscall_entry(syscall_get_arch(), regs->syscallno, - regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); + audit_syscall_entry(regs->syscallno, regs->orig_x0, regs->regs[1], + regs->regs[2], regs->regs[3]); #endif return regs->syscallno;