rpms/kernel/devel kernel.spec, 1.157, 1.158 linux-2.6-utrace-core.patch, 1.6, 1.7

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
Log Message:
utrace update (#248532, #267161, #284311)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kernel.spec	11 Sep 2007 21:25:51 -0000	1.157
+++ kernel.spec	12 Sep 2007 00:16:26 -0000	1.158
@@ -1796,14 +1796,14 @@
 
 
 %changelog
+* Tue Sep 11 2007 Roland McGrath <roland at redhat.com>
+- utrace update (#248532, #267161, #284311)
+
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - fix emulated vmware SCSI disks
 - add option to disable libata PATA DMA
 
 * Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
-- utrace update
-
-* Tue Sep 11 2007 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.23-rc6
 
 * Mon Sep 10 2007 Chuck Ebbert <cebbert at redhat.com>

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace-core.patch	4 Sep 2007 20:53:27 -0000	1.6
+++ linux-2.6-utrace-core.patch	12 Sep 2007 00:16:26 -0000	1.7
@@ -20,7 +20,7 @@
 ---
 
  kernel/Makefile                   |    1 
- kernel/utrace.c                   | 2344 +++++++++++++++++++++++++++++++++++++
+ kernel/utrace.c                   | 2359 +++++++++++++++++++++++++++++++++++++
  Documentation/utrace.txt          |  579 +++++++++
  Documentation/DocBook/Makefile    |    2 
  Documentation/DocBook/utrace.tmpl |   23 
@@ -28,7 +28,7 @@
  include/linux/utrace.h            |  544 +++++++++
  include/linux/sched.h             |    5 
  init/Kconfig                      |   20 
- 9 files changed, 3585 insertions(+), 18 deletions(-)
+ 9 files changed, 3600 insertions(+), 18 deletions(-)
  create kernel/utrace.c
  create Documentation/utrace.txt
  create Documentation/DocBook/utrace.tmpl
@@ -46,7 +46,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/kernel/utrace.c
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,2344 @@
+@@ -0,0 +1,2359 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2004,13 +2004,28 @@
 +	 */
 +	if (signal.signr != 0) {
 +		if (signal.return_ka == NULL) {
-+			ka = &tsk->sighand->action[signal.signr - 1];
++			/*
++			 * utrace_inject_signal recorded this to have us
++			 * use the injected signal's normal sigaction.  We
++			 * have to perform the SA_ONESHOT work now because
++			 * our caller will never touch the real sigaction.
++			 */
++			ka = &tsk->sighand->action[info->si_signo - 1];
++			*return_ka = *ka;
 +			if (ka->sa.sa_flags & SA_ONESHOT)
 +				ka->sa.sa_handler = SIG_DFL;
-+			*return_ka = *ka;
 +		}
 +		else
 +			BUG_ON(signal.return_ka != return_ka);
++
++		/*
++		 * We already processed the SA_ONESHOT work ahead of time.
++		 * Once we return nonzero, our caller will only refer to
++		 * return_ka.  So we must clear the flag to be sure it
++		 * doesn't clear return_ka->sa.sa_handler.
++		 */
++		return_ka->sa.sa_flags &= ~SA_ONESHOT;
++
 +		return signal.signr;
 +	}
 +