Skip to contentSkip to conversation

arm64: audit: Fix build for audit changes

PATCH New Mark Brown 2 participants 2 messages Aug 17, 2014 – Aug 18, 2014

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 arm64: audit: Fix build for audit changes

From: Mark Brown <[email protected]>

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.

---

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(-)
arch/arm64/kernel/ptrace.c +2 -2
index 0310811..159251f 100644
@@ -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;
Signature · 1 line
2.1.0.rc1
maintainer
#1 lore raw

PATCH 1/1 arm64: audit: Fix build for audit changes

Quoted 9 lines · Mark Brown

From: Mark Brown <[email protected]>

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.

BTW, we plan to revert the temporary hack to avoid this error with defconfig. So the above patch should go into next on top of the other patches from Eric changing the function prototype.

Thanks,

Catalin