Re: linux-next: manual merge of the tip tree with the audit tree

From: Andy Lutomirski
Date: Wed Sep 24 2014 - 14:15:24 EST

On Wed, Sep 24, 2014 at 11:12 AM, Andy Lutomirski <luto@xxxxxxxxxxxxxx> wrote:
> On Tue, Sep 23, 2014 at 10:47 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>> Hi all,
>> Today's linux-next merge of the tip tree got a conflict in
>> arch/x86/kernel/ptrace.c between commit 91397401bb50 ("ARCH: AUDIT:
>> audit_syscall_entry() should not require the arch") from the audit tree
>> and commit e0ffbaabc46d ("x86: Split syscall_trace_enter into two
>> phases") from the tip tree.
>> I fixed it up (see below - there is more cleanup possible since
>> do_audit_syscall_entry() no longer needs its "arch" argument) and can
>> carry the fix as necessary (no action is required).
> [mainly for Eric]
> This appears to re-introduce the bug fixed in:
> commit 81f49a8fd7088cfcb588d182eeede862c0e3303e
> Author: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
> Date: Fri Sep 5 15:13:52 2014 -0700
> x86, x32, audit: Fix x32's AUDIT_ARCH wrt audit
> This bug is not currently observable because enabling x32 disables
> syscall auditing.
> Eric, do you want to fix this or should I?

Never mind, -ETOOEARLY. There's no bug. TS_COMPAT != is_compat_task.


> --Andy

Andy Lutomirski
AMA Capital Management, LLC
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at