Re: 2.6.11-rc5-mm1

From: Jeff Dike
Date: Thu Mar 03 2005 - 12:40:19 EST


chrisw@xxxxxxxx said:
> Thanks, I'll push that with rest of audit changes.

Applies on top of your changes.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

Index: linux-2.6.10/arch/um/kernel/ptrace.c
===================================================================
--- linux-2.6.10.orig/arch/um/kernel/ptrace.c 2005-03-03 11:41:34.000000000 -0500
+++ linux-2.6.10/arch/um/kernel/ptrace.c 2005-03-03 11:42:41.000000000 -0500
@@ -341,11 +341,15 @@

if (unlikely(current->audit_context)) {
if (!entryexit)
- audit_syscall_entry(current, regs->orig_eax,
- regs->ebx, regs->ecx,
- regs->edx, regs->esi);
+ audit_syscall_entry(current,
+ UPT_SYSCALL_NR(&regs->regs),
+ UPT_SYSCALL_ARG1(&regs->regs),
+ UPT_SYSCALL_ARG2(&regs->regs),
+ UPT_SYSCALL_ARG3(&regs->regs),
+ UPT_SYSCALL_ARG4(&regs->regs));
else
- audit_syscall_exit(current, regs->eax);
+ audit_syscall_exit(current,
+ UPT_SYSCALL_RET(&regs->regs));
}

/* Fake a debug trap */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/