Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2851785d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86/auditsyscall' of... 

Merge branch 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: auditsyscall: fix fastpath return value after reschedule
parents e916beab 03275591

arch/x86/kernel/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -571,8 +571,8 @@ auditsys: 
	 * masked off.

	 */

sysret_audit:

	movq %rax,%rsi		/* second arg, syscall return value */

	cmpq $0,%rax		/* is it < 0? */

	movq RAX-ARGOFFSET(%rsp),%rsi	/* second arg, syscall return value */

	cmpq $0,%rsi		/* is it < 0? */

	setl %al		/* 1 if so, 0 if not */

	movzbl %al,%edi		/* zero-extend that into %edi */

	inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */