From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: audit: Fix build for audit changes
Date: Thu, 17 Jul 2014 12:59:38 +0100 [thread overview]
Message-ID: <20140717115937.GF18203@arm.com> (raw)
In-Reply-To: <1405596402-23844-1-git-send-email-broonie@kernel.org>
On Thu, Jul 17, 2014 at 12:26:42PM +0100, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> 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 <broonie@linaro.org>
> ---
> 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
next prev parent reply other threads:[~2014-07-17 11:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 11:26 [PATCH] arm64: audit: Fix build for audit changes Mark Brown
2014-07-17 11:59 ` Catalin Marinas [this message]
2014-07-17 14:50 ` Mark Brown
2014-07-17 14:58 ` Catalin Marinas
2014-07-17 15:01 ` Mark Brown
2014-07-17 16:26 ` Richard Guy Briggs
2014-07-24 19:12 ` Mark Brown
2014-07-25 9:21 ` Catalin Marinas
2014-07-25 11:04 ` Mark Brown
2014-08-11 9:09 ` Will Deacon
2014-08-11 13:22 ` Eric Paris
2014-08-11 13:33 ` Will Deacon
2014-08-11 15:15 ` Catalin Marinas
2014-08-11 15:47 ` Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2014-08-17 14:26 Mark Brown
2014-08-18 16:40 ` Catalin Marinas
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=20140717115937.GF18203@arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).