Skip to contentSkip to conversation

Mask 32-bit system call arguments to 32 bits on PPC64 in audit code

POWERPC Heiko Carstens 1 participant 2 messages Feb 22, 2007 – Feb 28, 2007 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 45 lines · Linux Kernel Mailing List
Commit:     cfcd1705b61ecce1ab102b9593cf733fef314a19
Parent:     0e47e3cca100e7c8e8124378e4e44969c2e042fd
Author:     David Woodhouse <[email protected]>
AuthorDate: Sun Jan 14 09:38:18 2007 +0800
Committer:  Paul Mackerras <[email protected]>
CommitDate: Wed Jan 24 21:13:58 2007 +1100

[POWERPC] Mask 32-bit system call arguments to 32 bits on PPC64 in audit code

The system call entry code will clear the high bits of argument registers before invoking the system call; don't report whatever noise happens to be in the high bits of the register before that happens.

---
 arch/powerpc/kernel/ptrace.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)
arch/powerpc/kernel/ptrace.c +8 -9
index 975102a..cc44c7b 100644
@@ -532,16 +532,22 @@ void do_syscall_trace_enter(struct pt_regs *regs)
 	    && (current->ptrace & PT_PTRACED))
 		do_syscall_trace();
 
-	if (unlikely(current->audit_context))
-		audit_syscall_entry(
-#ifdef CONFIG_PPC32
-				    AUDIT_ARCH_PPC,
-#else
-				    test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64,
+	if (unlikely(current->audit_context)) {
+#ifdef CONFIG_PPC64
+		if (!test_thread_flag(TIF_32BIT))
+			audit_syscall_entry(AUDIT_ARCH_PPC64,
+					    regs->gpr[0],
+					    regs->gpr[3], regs->gpr[4],
+					    regs->gpr[5], regs->gpr[6]);
+		else
 #endif
-				    regs->gpr[0],
-				    regs->gpr[3], regs->gpr[4],
-				    regs->gpr[5], regs->gpr[6]);

arch/powerpc/kernel/ptrace.c void do_syscall_trace_enter(struct pt_regs *regs) · line 553

Quoted 10 lines
arch/powerpc/kernel/ptrace.c +7 -0
+			audit_syscall_entry(AUDIT_ARCH_PPC,
+					    regs->gpr[0],
+					    regs->gpr[3] & 0xffffffff,
+					    regs->gpr[4] & 0xffffffff,
+					    regs->gpr[5] & 0xffffffff,
+					    regs->gpr[6] & 0xffffffff);
+	}
 }
 
 void do_syscall_trace_leave(struct pt_regs *regs)

Why is this needed? The audit code is not supposed to look at the high bits if the audited task is a compat task.
It does that at at least one place in kernel/auditsc.c:

	case 4: /* socketcall */
		return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);

So does the audit code assume that the high bits are cleared or is this a bug in the audit code?

Signature · 8 lines
Heiko Carstens
Linux on System z Development

IBM Deutschland Entwicklung GmbH
Vorsitzender des Aufsichtsrats: Johann Weihen
Geschaeftsfuehrung : Herbert Kircher
Sitz der Gesellschaft: Boeblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
#2 lore raw
Quoted 61 lines · Heiko Carstens
Quoted 45 lines · Linux Kernel Mailing List
Commit:     cfcd1705b61ecce1ab102b9593cf733fef314a19
Parent:     0e47e3cca100e7c8e8124378e4e44969c2e042fd
Author:     David Woodhouse <[email protected]>
AuthorDate: Sun Jan 14 09:38:18 2007 +0800
Committer:  Paul Mackerras <[email protected]>
CommitDate: Wed Jan 24 21:13:58 2007 +1100

[POWERPC] Mask 32-bit system call arguments to 32 bits on PPC64 in audit code

The system call entry code will clear the high bits of argument registers before invoking the system call; don't report whatever noise happens to be in the high bits of the register before that happens.

---
 arch/powerpc/kernel/ptrace.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)
arch/powerpc/kernel/ptrace.c +8 -9
index 975102a..cc44c7b 100644
@@ -532,16 +532,22 @@ void do_syscall_trace_enter(struct pt_regs *regs)
 	    && (current->ptrace & PT_PTRACED))
 		do_syscall_trace();
 
-	if (unlikely(current->audit_context))
-		audit_syscall_entry(
-#ifdef CONFIG_PPC32
-				    AUDIT_ARCH_PPC,
-#else
-				    test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64,
+	if (unlikely(current->audit_context)) {
+#ifdef CONFIG_PPC64
+		if (!test_thread_flag(TIF_32BIT))
+			audit_syscall_entry(AUDIT_ARCH_PPC64,
+					    regs->gpr[0],
+					    regs->gpr[3], regs->gpr[4],
+					    regs->gpr[5], regs->gpr[6]);
+		else
 #endif
-				    regs->gpr[0],
-				    regs->gpr[3], regs->gpr[4],
-				    regs->gpr[5], regs->gpr[6]);

arch/powerpc/kernel/ptrace.c void do_syscall_trace_enter(struct pt_regs *regs) · line 553

Quoted 10 lines
arch/powerpc/kernel/ptrace.c +7 -0
+			audit_syscall_entry(AUDIT_ARCH_PPC,
+					    regs->gpr[0],
+					    regs->gpr[3] & 0xffffffff,
+					    regs->gpr[4] & 0xffffffff,
+					    regs->gpr[5] & 0xffffffff,
+					    regs->gpr[6] & 0xffffffff);
+	}
 }
 
 void do_syscall_trace_leave(struct pt_regs *regs)

Why is this needed? The audit code is not supposed to look at the high bits if the audited task is a compat task.
It does that at at least one place in kernel/auditsc.c:

Quoted 5 lines
	case 4: /* socketcall */
		return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);

So does the audit code assume that the high bits are cleared or is this a bug in the audit code?

Extended the cc list with a few people that recently worked on the audit code, maybe somebody could answer my question above?