public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chris Wright <chrisw@sous-sol.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	Chris Wedgewood <reviews@ml.cw.f00f.org>,
	torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
	Andi Kleen <ak@suse.de>
Subject: [PATCH 10/11] x86_64: Dont do syscall exit tracing twice
Date: Fri, 02 Jun 2006 00:00:10 -0700	[thread overview]
Message-ID: <20060602194746.282298000@sous-sol.org> (raw)
In-Reply-To: 20060602194618.482948000@sous-sol.org

[-- Attachment #1: x86_64-don-t-do-syscall-exit-tracing-twice.patch --]
[-- Type: text/plain, Size: 1074 bytes --]

-stable review patch.  If anyone has any objections, please let us know.
------------------

From: Andi Kleen <ak@suse.de>

This fixes a regression from the earlier DOS fix for non canonical
IRET addresses. It broke UML.

int_ret_from_syscall already does syscall exit tracing, so 
no need to do it again in the caller.

This caused problems for UML and some other special programs doing
syscall interception.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
 arch/x86_64/kernel/entry.S |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- linux-2.6.16.19.orig/arch/x86_64/kernel/entry.S
+++ linux-2.6.16.19/arch/x86_64/kernel/entry.S
@@ -281,12 +281,7 @@ tracesys:			 
 	ja  1f
 	movq %r10,%rcx	/* fixup for C */
 	call *sys_call_table(,%rax,8)
-	movq %rax,RAX-ARGOFFSET(%rsp)
-1:	SAVE_REST
-	movq %rsp,%rdi
-	call syscall_trace_leave
-	RESTORE_TOP_OF_STACK %rbx
-	RESTORE_REST
+1:	movq %rax,RAX-ARGOFFSET(%rsp)
 	/* Use IRET because user could have changed frame */
 	jmp int_ret_from_sys_call
 	CFI_ENDPROC

--

  parent reply	other threads:[~2006-06-02 19:48 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-02 19:46 [PATCH 00/11] -stable review Chris Wright
2006-06-02  7:00 ` [PATCH 01/11] Altix: correct ioc4 port order Chris Wright
2006-06-02  7:00 ` [PATCH 02/11] Altix: correct ioc3 " Chris Wright
2006-06-02  7:00 ` [PATCH 03/11] Cpuset: might sleep checking zones allowed fix Chris Wright
2006-06-02  7:00 ` [PATCH 04/11] PowerMac: force only suspend-to-disk to be valid Chris Wright
2006-06-02  7:00 ` [PATCH 05/11] Input: psmouse - fix new device detection logic Chris Wright
2006-06-02  7:00 ` [PATCH 06/11] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices Chris Wright
2006-06-02  7:00 ` [PATCH 07/11] the latest consensus libata resume fix Chris Wright
2006-06-02 19:50   ` Jens Axboe
2006-06-02 20:02     ` Greg KH
2006-06-02 20:02     ` [stable] " Chris Wright
2006-06-03  8:49     ` Marcel Holtmann
2006-06-03 13:22       ` Jens Axboe
2006-06-03 17:41         ` Chris Wright
2006-06-02  7:00 ` [PATCH 08/11] ipw2200: Filter unsupported channels out in ad-hoc mode Chris Wright
2006-06-02  7:00 ` [PATCH 09/11] x86_64: x86_64 add crashdump trigger points Chris Wright
2006-06-02  7:00 ` Chris Wright [this message]
2006-06-02  7:00 ` [PATCH 11/11] sbp2: backport read_capacity workaround for iPod Chris Wright

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060602194746.282298000@sous-sol.org \
    --to=chrisw@sous-sol.org \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --cc=reviews@ml.cw.f00f.org \
    --cc=stable@kernel.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox