From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catalin Marinas Subject: Re: [PATCH] arm64: audit: Fix build for audit changes Date: Thu, 17 Jul 2014 12:59:38 +0100 Message-ID: <20140717115937.GF18203@arm.com> References: <1405596402-23844-1-git-send-email-broonie@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1405596402-23844-1-git-send-email-broonie@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Mark Brown Cc: "linaro-kernel@lists.linaro.org" , Mark Brown , Richard Guy Briggs , Will Deacon , Eric Paris , "linux-audit@redhat.com" , "linux-arm-kernel@lists.infradead.org" List-Id: linux-audit@redhat.com On Thu, Jul 17, 2014 at 12:26:42PM +0100, Mark Brown wrote: > 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 > --- > 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 70526cfda056..310842e3d477 100644 > --- a/arch/arm64/kernel/ptrace.c > +++ b/arch/arm64/kernel/ptrace.c > @@ -1115,8 +1115,8 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) > if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) > trace_sys_enter(regs, regs->syscallno); > > - 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]); > > return regs->syscallno; > } Thanks. This will have to be applied after 3.17-rc1 since commit 3efe33f5d2 does not seem to be in mainline yet (nor the arm64 audit patches). -- Catalin