Attachment 108205 Details for Bug 85277 – Revert patch

[patch] Revert patch

0001-Revert-audit-x86-drop-arch-from-__audit_syscall_entr.patch (text/plain), 5.43 KB, created by Paulo Zanoni on 2014-10-21 19:10:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Zanoni

Created: 2014-10-21 19:10:28 UTC

Size: 5.43 KB

patch

obsolete

>From c5d3066e0e4cbce21d35a5af1096c4086fa8dbfb Mon Sep 17 00:00:00 2001
>From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>Date: Tue, 21 Oct 2014 17:06:16 -0200
>Subject: [PATCH] Revert "audit: x86: drop arch from __audit_syscall_entry()
> interface"
>
>This reverts commit b4f0d3755c5e9cc86292d5fd78261903b4f23d4a.
>
>Conflicts:
>	arch/x86/kernel/entry_64.S
>---
> arch/x86/ia32/ia32entry.S  | 12 ++++++------
> arch/x86/kernel/entry_32.S | 11 ++++++-----
> arch/x86/kernel/entry_64.S | 16 ++++++++++++++++
> include/linux/audit.h      |  5 +++--
> kernel/auditsc.c           |  6 ++++--
> 5 files changed, 35 insertions(+), 15 deletions(-)
>
>diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
>index 8ffba18..711de08 100644
>--- a/arch/x86/ia32/ia32entry.S
>+++ b/arch/x86/ia32/ia32entry.S
>@@ -198,12 +198,12 @@ sysexit_from_sys_call:
> 
> #ifdef CONFIG_AUDITSYSCALL
> 	.macro auditsys_entry_common
>-	movl %esi,%r8d			/* 5th arg: 4th syscall arg */
>-	movl %ecx,%r9d			/*swap with edx*/
>-	movl %edx,%ecx			/* 4th arg: 3rd syscall arg */
>-	movl %r9d,%edx			/* 3rd arg: 2nd syscall arg */
>-	movl %ebx,%esi			/* 2nd arg: 1st syscall arg */
>-	movl %eax,%edi			/* 1st arg: syscall number */
>+	movl %esi,%r9d			/* 6th arg: 4th syscall arg */
>+	movl %edx,%r8d			/* 5th arg: 3rd syscall arg */
>+	/* (already in %ecx)		   4th arg: 2nd syscall arg */
>+	movl %ebx,%edx			/* 3rd arg: 1st syscall arg */
>+	movl %eax,%esi			/* 2nd arg: syscall number */
>+	movl $AUDIT_ARCH_I386,%edi	/* 1st arg: audit arch */
> 	call __audit_syscall_entry
> 	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall number */
> 	cmpq $(IA32_NR_syscalls-1),%rax
>diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
>index b553ed8..4b0e1df 100644
>--- a/arch/x86/kernel/entry_32.S
>+++ b/arch/x86/kernel/entry_32.S
>@@ -449,11 +449,12 @@ sysenter_audit:
> 	jnz syscall_trace_entry
> 	addl $4,%esp
> 	CFI_ADJUST_CFA_OFFSET -4
>-	movl %esi,4(%esp)		/* 5th arg: 4th syscall arg */
>-	movl %edx,(%esp)		/* 4th arg: 3rd syscall arg */
>-	/* %ecx already in %ecx		   3rd arg: 2nd syscall arg */
>-	movl %ebx,%edx			/* 2nd arg: 1st syscall arg */
>-	/* %eax already in %eax		   1st arg: syscall number */
>+	/* %esi already in 8(%esp)	   6th arg: 4th syscall arg */
>+	/* %edx already in 4(%esp)	   5th arg: 3rd syscall arg */
>+	/* %ecx already in 0(%esp)	   4th arg: 2nd syscall arg */
>+	movl %ebx,%ecx			/* 3rd arg: 1st syscall arg */
>+	movl %eax,%edx			/* 2nd arg: syscall number */
>+	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */
> 	call __audit_syscall_entry
> 	pushl_cfi %ebx
> 	movl PT_EAX(%esp),%eax		/* reload syscall number */
>diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
>index df088bb..fcdc4f6 100644
>--- a/arch/x86/kernel/entry_64.S
>+++ b/arch/x86/kernel/entry_64.S
>@@ -478,6 +478,22 @@ sysret_signal:
> 
> #ifdef CONFIG_AUDITSYSCALL
> 	/*
>+	 * Fast path for syscall audit without full syscall trace.
>+	 * We just call __audit_syscall_entry() directly, and then
>+	 * jump back to the normal fast path.
>+	 */
>+auditsys:
>+	movq %r10,%r9			/* 6th arg: 4th syscall arg */
>+	movq %rdx,%r8			/* 5th arg: 3rd syscall arg */
>+	movq %rsi,%rcx			/* 4th arg: 2nd syscall arg */
>+	movq %rdi,%rdx			/* 3rd arg: 1st syscall arg */
>+	movq %rax,%rsi			/* 2nd arg: syscall number */
>+	movl $AUDIT_ARCH_X86_64,%edi	/* 1st arg: audit arch */
>+	call __audit_syscall_entry
>+	LOAD_ARGS 0		/* reload call-clobbered registers */
>+	jmp system_call_fastpath
>+
>+	/*
> 	 * Return fast path for syscall audit.  Call __audit_syscall_exit()
> 	 * directly and then jump back to the fast path with TIF_SYSCALL_AUDIT
> 	 * masked off.
>diff --git a/include/linux/audit.h b/include/linux/audit.h
>index 36dffec..371db03 100644
>--- a/include/linux/audit.h
>+++ b/include/linux/audit.h
>@@ -119,7 +119,8 @@ extern void audit_log_session_info(struct audit_buffer *ab);
> 				/* Public API */
> extern int  audit_alloc(struct task_struct *task);
> extern void __audit_free(struct task_struct *task);
>-extern void __audit_syscall_entry(int major, unsigned long a0, unsigned long a1,
>+extern void __audit_syscall_entry(int arch,
>+				  int major, unsigned long a0, unsigned long a1,
> 				  unsigned long a2, unsigned long a3);
> extern void __audit_syscall_exit(int ret_success, long ret_value);
> extern struct filename *__audit_reusename(const __user char *uptr);
>@@ -151,7 +152,7 @@ static inline void audit_syscall_entry(int major, unsigned long a0,
> 				       unsigned long a3)
> {
> 	if (unlikely(current->audit_context))
>-		__audit_syscall_entry(major, a0, a1, a2, a3);
>+		__audit_syscall_entry(syscall_get_arch(), major, a0, a1, a2, a3);
> }
> static inline void audit_syscall_exit(void *pt_regs)
> {
>diff --git a/kernel/auditsc.c b/kernel/auditsc.c
>index e420a0c..176e52e 100644
>--- a/kernel/auditsc.c
>+++ b/kernel/auditsc.c
>@@ -1498,6 +1498,7 @@ void __audit_free(struct task_struct *tsk)
> 
> /**
>  * audit_syscall_entry - fill in an audit record at syscall entry
>+ * @arch: architecture type
>  * @major: major syscall type (function)
>  * @a1: additional syscall register 1
>  * @a2: additional syscall register 2
>@@ -1512,8 +1513,9 @@ void __audit_free(struct task_struct *tsk)
>  * will only be written if another part of the kernel requests that it
>  * be written).
>  */
>-void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
>-			   unsigned long a3, unsigned long a4)
>+void __audit_syscall_entry(int arch, int major,
>+			 unsigned long a1, unsigned long a2,
>+			 unsigned long a3, unsigned long a4)
> {
> 	struct task_struct *tsk = current;
> 	struct audit_context *context = tsk->audit_context;
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 85277: 108205

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.