rpms/kernel/devel kernel-2.6.spec, 1.2857, 1.2858 linux-2.6-proc-self-maps-fix.patch, 1.9, 1.10 linux-2.6-utrace.patch, 1.39, 1.40
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 8 09:40:13 UTC 2006
Author: roland
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23649
Modified Files:
kernel-2.6.spec linux-2.6-proc-self-maps-fix.patch
linux-2.6-utrace.patch
Log Message:
utrace update, re-enable it
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2857
retrieving revision 1.2858
diff -u -r1.2857 -r1.2858
--- kernel-2.6.spec 7 Dec 2006 16:09:08 -0000 1.2857
+++ kernel-2.6.spec 8 Dec 2006 09:40:10 -0000 1.2858
@@ -725,7 +725,7 @@
# Patches 10 through 100 are meant for core subsystem upgrades
# Roland's utrace ptrace replacement.
-#%patch10 -p1
+%patch10 -p1
# sysrq works always
%patch20 -p1
linux-2.6-proc-self-maps-fix.patch:
fs/proc/base.c | 20 ++++++++++++++++++++
fs/proc/internal.h | 2 ++
fs/proc/task_mmu.c | 3 +--
include/linux/ptrace.h | 1 +
kernel/ptrace.c | 4 ++--
5 files changed, 26 insertions(+), 4 deletions(-)
Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-proc-self-maps-fix.patch 5 Dec 2006 17:33:08 -0000 1.9
+++ linux-2.6-proc-self-maps-fix.patch 8 Dec 2006 09:40:10 -0000 1.10
@@ -97,12 +97,3 @@
task_unlock(task);
return !err;
}
-@@ -193,7 +193,7 @@ repeat:
- /* the same process cannot be attached many times */
- if (task->ptrace & PT_PTRACED)
- goto bad;
-- retval = may_attach(task);
-+ retval = __ptrace_may_attach(task);
- if (retval)
- goto bad;
-
linux-2.6-utrace.patch:
Documentation/utrace.txt | 579 +++++++++++
arch/alpha/kernel/asm-offsets.c | 2
arch/alpha/kernel/entry.S | 4
arch/arm/kernel/ptrace.c | 36
arch/arm26/kernel/ptrace.c | 32
arch/frv/kernel/ptrace.c | 15
arch/i386/kernel/entry.S | 7
arch/i386/kernel/i387.c | 143 +-
arch/i386/kernel/process.c | 3
arch/i386/kernel/ptrace.c | 863 +++++++++-------
arch/i386/kernel/signal.c | 37
arch/i386/kernel/vm86.c | 7
arch/ia64/ia32/ia32_entry.S | 2
arch/ia64/ia32/sys_ia32.c | 537 ++++++++++
arch/ia64/kernel/asm-offsets.c | 2
arch/ia64/kernel/fsys.S | 16
arch/ia64/kernel/mca.c | 2
arch/ia64/kernel/ptrace.c | 1680 ++++++++++++++++----------------
arch/ia64/kernel/signal.c | 4
arch/mips/kernel/ptrace.c | 21
arch/mips/kernel/sysirix.c | 2
arch/powerpc/kernel/Makefile | 4
arch/powerpc/kernel/asm-offsets.c | 2
arch/powerpc/kernel/process.c | 5
arch/powerpc/kernel/ptrace-common.h | 161 ---
arch/powerpc/kernel/ptrace.c | 959 +++++++++++-------
arch/powerpc/kernel/ptrace32.c | 436 --------
arch/powerpc/kernel/signal_32.c | 55 +
arch/powerpc/kernel/signal_64.c | 3
arch/powerpc/kernel/sys_ppc32.c | 5
arch/powerpc/lib/sstep.c | 3
arch/ppc/kernel/asm-offsets.c | 2
arch/s390/kernel/Makefile | 2
arch/s390/kernel/compat_linux.c | 3
arch/s390/kernel/compat_signal.c | 5
arch/s390/kernel/process.c | 3
arch/s390/kernel/ptrace.c | 1073 +++++++++-----------
arch/s390/kernel/signal.c | 3
arch/s390/kernel/traps.c | 6
arch/sparc64/kernel/Makefile | 2
arch/sparc64/kernel/binfmt_aout32.c | 2
arch/sparc64/kernel/entry.S | 6
arch/sparc64/kernel/process.c | 3
arch/sparc64/kernel/ptrace.c | 1221 ++++++++++++-----------
arch/sparc64/kernel/signal.c | 2
arch/sparc64/kernel/signal32.c | 2
arch/sparc64/kernel/sys_sparc32.c | 3
arch/sparc64/kernel/systbls.S | 4
arch/x86_64/ia32/fpu32.c | 92 +
arch/x86_64/ia32/ia32_aout.c | 6
arch/x86_64/ia32/ia32_signal.c | 8
arch/x86_64/ia32/ia32entry.S | 2
arch/x86_64/ia32/ptrace32.c | 723 +++++++++----
arch/x86_64/ia32/sys_ia32.c | 5
arch/x86_64/kernel/process.c | 5
arch/x86_64/kernel/ptrace.c | 657 +++++++-----
arch/x86_64/kernel/signal.c | 28
arch/x86_64/kernel/traps.c | 8
arch/x86_64/mm/fault.c | 4
drivers/connector/cn_proc.c | 4
fs/binfmt_aout.c | 6
fs/binfmt_elf.c | 6
fs/binfmt_elf_fdpic.c | 7
fs/binfmt_flat.c | 3
fs/binfmt_som.c | 2
fs/exec.c | 11
fs/proc/array.c | 12
fs/proc/base.c | 17
include/asm-i386/i387.h | 13
include/asm-i386/signal.h | 4
include/asm-i386/thread_info.h | 7
include/asm-i386/tracehook.h | 49
include/asm-ia64/elf.h | 24
include/asm-ia64/tracehook.h | 83 +
include/asm-powerpc/tracehook.h | 80 +
include/asm-s390/tracehook.h | 53 +
include/asm-sparc64/tracehook.h | 44
include/asm-x86_64/fpu32.h | 3
include/asm-x86_64/thread_info.h | 2
include/asm-x86_64/tracehook.h | 54 +
include/linux/init_task.h | 3
include/linux/ptrace.h | 224 +++-
include/linux/sched.h | 25
include/linux/tracehook.h | 707 +++++++++++++
include/linux/utrace.h | 504 +++++++++
init/Kconfig | 29
kernel/Makefile | 1
kernel/exit.c | 244 +---
kernel/fork.c | 62 -
kernel/ptrace.c | 1633 +++++++++++++++++++++++++------
kernel/signal.c | 211 ----
kernel/sys.c | 2
kernel/timer.c | 6
kernel/tsacct.c | 2
kernel/utrace.c | 1860 ++++++++++++++++++++++++++++++++++++
security/selinux/hooks.c | 54 -
security/selinux/include/objsec.h | 1
97 files changed, 10509 insertions(+), 5050 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.39 -r 1.40 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- linux-2.6-utrace.patch 23 Nov 2006 21:49:51 -0000 1.39
+++ linux-2.6-utrace.patch 8 Dec 2006 09:40:10 -0000 1.40
@@ -1,103 +1,102 @@
- Documentation/utrace.txt | 455 ++++++++
- arch/alpha/kernel/asm-offsets.c | 2
- arch/alpha/kernel/entry.S | 4
- arch/arm/kernel/ptrace.c | 36 -
- arch/arm26/kernel/ptrace.c | 32 -
- arch/frv/kernel/ptrace.c | 15
- arch/i386/kernel/entry.S | 7
- arch/i386/kernel/i387.c | 143 +--
- arch/i386/kernel/process.c | 3
- arch/i386/kernel/ptrace.c | 863 ++++++++-------
- arch/i386/kernel/signal.c | 37 -
- arch/i386/kernel/vm86.c | 7
- arch/ia64/ia32/ia32_entry.S | 2
- arch/ia64/ia32/sys_ia32.c | 537 +++++++++-
- arch/ia64/kernel/asm-offsets.c | 2
- arch/ia64/kernel/fsys.S | 16
- arch/ia64/kernel/mca.c | 2
- arch/ia64/kernel/ptrace.c | 1680 +++++++++++++++---------------
- arch/ia64/kernel/signal.c | 4
- arch/mips/kernel/ptrace.c | 21
- arch/mips/kernel/sysirix.c | 2
- arch/powerpc/kernel/Makefile | 4
- arch/powerpc/kernel/asm-offsets.c | 2
- arch/powerpc/kernel/process.c | 5
- arch/powerpc/kernel/ptrace-common.h | 161 ---
- arch/powerpc/kernel/ptrace.c | 959 ++++++++++-------
- arch/powerpc/kernel/ptrace32.c | 436 --------
- arch/powerpc/kernel/signal_32.c | 55 +
- arch/powerpc/kernel/signal_64.c | 3
- arch/powerpc/kernel/sys_ppc32.c | 5
- arch/powerpc/lib/sstep.c | 3
- arch/powerpc/platforms/cell/spufs/run.c | 2
- arch/ppc/kernel/asm-offsets.c | 2
- arch/s390/kernel/Makefile | 2
- arch/s390/kernel/compat_linux.c | 3
- arch/s390/kernel/compat_signal.c | 5
- arch/s390/kernel/process.c | 3
- arch/s390/kernel/ptrace.c | 1073 +++++++++----------
- arch/s390/kernel/signal.c | 3
- arch/s390/kernel/traps.c | 6
- arch/sparc64/Makefile | 0
- arch/sparc64/kernel/Makefile | 2
- arch/sparc64/kernel/binfmt_aout32.c | 2
- arch/sparc64/kernel/entry.S | 6
- arch/sparc64/kernel/process.c | 3
- arch/sparc64/kernel/ptrace.c | 1221 ++++++++++++----------
- arch/sparc64/kernel/signal.c | 2
- arch/sparc64/kernel/signal32.c | 2
- arch/sparc64/kernel/sys_sparc32.c | 3
- arch/sparc64/kernel/systbls.S | 4
- arch/x86_64/ia32/fpu32.c | 92 +-
- arch/x86_64/ia32/ia32_aout.c | 6
- arch/x86_64/ia32/ia32_signal.c | 8
- arch/x86_64/ia32/ia32entry.S | 2
- arch/x86_64/ia32/ptrace32.c | 723 +++++++++----
- arch/x86_64/ia32/sys_ia32.c | 5
- arch/x86_64/kernel/process.c | 5
- arch/x86_64/kernel/ptrace.c | 657 +++++++-----
- arch/x86_64/kernel/signal.c | 28 -
- arch/x86_64/kernel/traps.c | 8
- arch/x86_64/mm/fault.c | 4
- drivers/connector/cn_proc.c | 4
- fs/binfmt_aout.c | 6
- fs/binfmt_elf.c | 6
- fs/binfmt_elf_fdpic.c | 7
- fs/binfmt_flat.c | 3
- fs/binfmt_som.c | 2
- fs/exec.c | 11
- fs/proc/array.c | 12
- fs/proc/base.c | 17
- include/asm-i386/i387.h | 13
- include/asm-i386/signal.h | 4
- include/asm-i386/thread_info.h | 7
- include/asm-i386/tracehook.h | 49 +
- include/asm-ia64/elf.h | 24
- include/asm-ia64/tracehook.h | 83 +
- include/asm-powerpc/tracehook.h | 80 +
- include/asm-s390/tracehook.h | 53 +
- include/asm-sparc64/tracehook.h | 44 +
- include/asm-x86_64/fpu32.h | 3
- include/asm-x86_64/thread_info.h | 2
- include/asm-x86_64/tracehook.h | 54 +
- include/linux/init_task.h | 3
- include/linux/ptrace.h | 224 +++-
- include/linux/sched.h | 25
- include/linux/tracehook.h | 707 +++++++++++++
- include/linux/utrace.h | 484 +++++++++
- init/Kconfig | 29 +
- kernel/Makefile | 1
- kernel/exit.c | 244 +---
- kernel/fork.c | 62 -
- kernel/ptrace.c | 1598 +++++++++++++++++++++++------
- kernel/signal.c | 211 +---
- kernel/sys.c | 2
- kernel/timer.c | 6
- kernel/tsacct.c | 2
- kernel/utrace.c | 1735 +++++++++++++++++++++++++++++++
- security/selinux/hooks.c | 54 +
- security/selinux/include/objsec.h | 1
- 99 files changed, 10201 insertions(+), 5056 deletions(-)
+ Documentation/utrace.txt | 579 +++++++++++
+ arch/alpha/kernel/asm-offsets.c | 2
+ arch/alpha/kernel/entry.S | 4
+ arch/arm/kernel/ptrace.c | 36 -
+ arch/arm26/kernel/ptrace.c | 32 -
+ arch/frv/kernel/ptrace.c | 15
+ arch/i386/kernel/entry.S | 7
+ arch/i386/kernel/i387.c | 143 +--
+ arch/i386/kernel/process.c | 3
+ arch/i386/kernel/ptrace.c | 863 +++++++++-------
+ arch/i386/kernel/signal.c | 37 -
+ arch/i386/kernel/vm86.c | 7
+ arch/ia64/ia32/ia32_entry.S | 2
+ arch/ia64/ia32/sys_ia32.c | 537 ++++++++++
+ arch/ia64/kernel/asm-offsets.c | 2
+ arch/ia64/kernel/fsys.S | 16
+ arch/ia64/kernel/mca.c | 2
+ arch/ia64/kernel/ptrace.c | 1680 ++++++++++++++++----------------
+ arch/ia64/kernel/signal.c | 4
+ arch/mips/kernel/ptrace.c | 21
+ arch/mips/kernel/sysirix.c | 2
+ arch/powerpc/kernel/Makefile | 4
+ arch/powerpc/kernel/asm-offsets.c | 2
+ arch/powerpc/kernel/process.c | 5
+ arch/powerpc/kernel/ptrace-common.h | 161 ---
+ arch/powerpc/kernel/ptrace.c | 959 +++++++++++-------
+ arch/powerpc/kernel/ptrace32.c | 436 --------
+ arch/powerpc/kernel/signal_32.c | 55 +
+ arch/powerpc/kernel/signal_64.c | 3
+ arch/powerpc/kernel/sys_ppc32.c | 5
+ arch/powerpc/lib/sstep.c | 3
+ arch/ppc/kernel/asm-offsets.c | 2
+ arch/s390/kernel/Makefile | 2
+ arch/s390/kernel/compat_linux.c | 3
+ arch/s390/kernel/compat_signal.c | 5
+ arch/s390/kernel/process.c | 3
+ arch/s390/kernel/ptrace.c | 1073 ++++++++++----------
+ arch/s390/kernel/signal.c | 3
+ arch/s390/kernel/traps.c | 6
+ arch/sparc64/Makefile | 0
+ arch/sparc64/kernel/Makefile | 2
+ arch/sparc64/kernel/binfmt_aout32.c | 2
+ arch/sparc64/kernel/entry.S | 6
+ arch/sparc64/kernel/process.c | 3
+ arch/sparc64/kernel/ptrace.c | 1221 +++++++++++++----------
+ arch/sparc64/kernel/signal.c | 2
+ arch/sparc64/kernel/signal32.c | 2
+ arch/sparc64/kernel/sys_sparc32.c | 3
+ arch/sparc64/kernel/systbls.S | 4
+ arch/x86_64/ia32/fpu32.c | 92 +-
+ arch/x86_64/ia32/ia32_aout.c | 6
+ arch/x86_64/ia32/ia32_signal.c | 8
+ arch/x86_64/ia32/ia32entry.S | 2
+ arch/x86_64/ia32/ptrace32.c | 723 +++++++++-----
+ arch/x86_64/ia32/sys_ia32.c | 5
+ arch/x86_64/kernel/process.c | 5
+ arch/x86_64/kernel/ptrace.c | 657 +++++++-----
+ arch/x86_64/kernel/signal.c | 28 -
+ arch/x86_64/kernel/traps.c | 8
+ arch/x86_64/mm/fault.c | 4
+ drivers/connector/cn_proc.c | 4
+ fs/binfmt_aout.c | 6
+ fs/binfmt_elf.c | 6
+ fs/binfmt_elf_fdpic.c | 7
+ fs/binfmt_flat.c | 3
+ fs/binfmt_som.c | 2
+ fs/exec.c | 11
+ fs/proc/array.c | 12
+ fs/proc/base.c | 17
+ include/asm-i386/i387.h | 13
+ include/asm-i386/signal.h | 4
+ include/asm-i386/thread_info.h | 7
+ include/asm-i386/tracehook.h | 49 +
+ include/asm-ia64/elf.h | 24
+ include/asm-ia64/tracehook.h | 83 ++
+ include/asm-powerpc/tracehook.h | 80 ++
+ include/asm-s390/tracehook.h | 53 +
+ include/asm-sparc64/tracehook.h | 44 +
+ include/asm-x86_64/fpu32.h | 3
+ include/asm-x86_64/thread_info.h | 2
+ include/asm-x86_64/tracehook.h | 54 +
+ include/linux/init_task.h | 3
+ include/linux/ptrace.h | 224 +++-
+ include/linux/sched.h | 25
+ include/linux/tracehook.h | 707 +++++++++++++
+ include/linux/utrace.h | 504 +++++++++
+ init/Kconfig | 29 +
+ kernel/Makefile | 1
+ kernel/exit.c | 244 +----
+ kernel/fork.c | 62 -
+ kernel/ptrace.c | 1633 +++++++++++++++++++++++++------
[...1713 lines suppressed...]
++ rcu_read_unlock();
}
- task_unlock(current);
- return ret;
@@ -6860,26 +7164,26 @@
+ si->si_addr);
+ }
+#endif
-
- /*
-- * This lock_kernel fixes a subtle race with suid exec
++
++ /*
+ * Set our QUIESCE flag right now, before notifying the tracer.
+ * We do this before setting state->u.live.stopped rather than
+ * by using UTRACE_ACTION_NEWSTATE in our return value, to
+ * ensure that the tracer can't get the notification and then
+ * try to resume us with PTRACE_CONT before we set the flag.
- */
-- lock_kernel();
-- if (request == PTRACE_TRACEME) {
-- ret = ptrace_traceme();
++ */
+ utrace_set_flags(tsk, engine, engine->flags | UTRACE_ACTION_QUIESCE);
-+
-+ /*
+
+ /*
+- * This lock_kernel fixes a subtle race with suid exec
+ * If regset 0 has a writeback call, do it now. On register window
+ * machines, this makes sure the user memory backing the register
+ * data is up to date by the time wait_task_inactive returns to
+ * ptrace_start in our tracer doing a PTRACE_PEEKDATA or the like.
-+ */
+ */
+- lock_kernel();
+- if (request == PTRACE_TRACEME) {
+- ret = ptrace_traceme();
+ regset = utrace_regset(tsk, engine, utrace_native_view(tsk), 0);
+ if (regset->writeback)
+ (*regset->writeback)(tsk, regset, 0);
@@ -7011,7 +7315,12 @@
+ else {
+ sigaddset(&child->pending.signal, SIGSTOP);
+ set_tsk_thread_flag(child, TIF_SIGPENDING);
-+ ptrace_update(child, child_engine, 0);
++ ret = ptrace_update(child, child_engine, 0);
++ /*
++ * The child hasn't run yet,
++ * it can't have died already.
++ */
++ BUG_ON(ret);
+ }
}
@@ -7048,7 +7357,8 @@
+ state->u.live.have_eventmsg = 1;
+ state->u.live.u.eventmsg = child_pid;
+ return ptrace_event(engine, parent, PTRACE_EVENT_VFORK_DONE);
-+}
+ }
+-#endif /* __ARCH_SYS_PTRACE */
+
+
+static u32
@@ -7158,8 +7468,7 @@
+ state = rcu_dereference((struct ptrace_state *) engine->data);
+
+ return state == NULL ? NULL : state->parent;
- }
--#endif /* __ARCH_SYS_PTRACE */
++}
+
+static int
+ptrace_allow_access_process_vm(struct utrace_attached_engine *engine,
@@ -7265,7 +7574,7 @@
static int proc_pid_environ(struct task_struct *task, char * buffer)
{
int res = 0;
-@@ -520,7 +514,8 @@ static ssize_t mem_read(struct file * fi
+@@ -521,7 +515,8 @@ static ssize_t mem_read(struct file * fi
if (!task)
goto out_no_task;
@@ -7275,7 +7584,7 @@
goto out;
ret = -ENOMEM;
-@@ -546,7 +541,8 @@ static ssize_t mem_read(struct file * fi
+@@ -547,7 +542,8 @@ static ssize_t mem_read(struct file * fi
this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
retval = access_process_vm(task, src, page, this_len, 0);
@@ -7285,7 +7594,7 @@
if (!ret)
ret = -EIO;
break;
-@@ -590,7 +586,8 @@ static ssize_t mem_write(struct file * f
+@@ -591,7 +587,8 @@ static ssize_t mem_write(struct file * f
if (!task)
goto out_no_task;
@@ -7433,7 +7742,7 @@
--- linux-2.6/init/Kconfig.utrace-ptrace-compat
+++ linux-2.6/init/Kconfig
-@@ -540,6 +540,35 @@ config STOP_MACHINE
+@@ -560,6 +560,35 @@ config STOP_MACHINE
Need stop_machine() primitive.
endmenu
@@ -7806,7 +8115,7 @@
current->thread.error_code = error_code;
--- linux-2.6/arch/i386/kernel/process.c.utrace-ptrace-compat
+++ linux-2.6/arch/i386/kernel/process.c
-@@ -750,9 +750,6 @@ asmlinkage int sys_execve(struct pt_regs
+@@ -752,9 +752,6 @@ asmlinkage int sys_execve(struct pt_regs
(char __user * __user *) regs.edx,
®s);
if (error == 0) {
@@ -8951,25 +9260,6 @@
extern char system_call_common[];
---- linux-2.6/arch/powerpc/platforms/cell/spufs/run.c.utrace-ptrace-compat
-+++ linux-2.6/arch/powerpc/platforms/cell/spufs/run.c
-@@ -70,12 +70,10 @@ static inline int spu_run_fini(struct sp
-
- if (signal_pending(current))
- ret = -ERESTARTSYS;
-- if (unlikely(current->ptrace & PT_PTRACED)) {
-- if ((*status & SPU_STATUS_STOPPED_BY_STOP)
-- && (*status >> SPU_STOP_STATUS_SHIFT) == 0x3fff) {
-- force_sig(SIGTRAP, current);
-- ret = -ERESTARTSYS;
-- }
-+ if ((*status & SPU_STATUS_STOPPED_BY_STOP)
-+ && (*status >> SPU_STOP_STATUS_SHIFT) == 0x3fff) {
-+ force_sig(SIGTRAP, current);
-+ ret = -ERESTARTSYS;
- }
- return ret;
- }
--- linux-2.6/arch/powerpc/kernel/ptrace32.c.utrace-ptrace-compat
+++ linux-2.6/arch/powerpc/kernel/ptrace32.c
@@ -1,436 +0,0 @@
@@ -9575,7 +9865,7 @@
-#endif /* _PPC64_PTRACE_COMMON_H */
--- linux-2.6/arch/powerpc/kernel/sys_ppc32.c.utrace-ptrace-compat
+++ linux-2.6/arch/powerpc/kernel/sys_ppc32.c
-@@ -438,11 +438,6 @@ long compat_sys_execve(unsigned long a0,
+@@ -439,11 +439,6 @@ long compat_sys_execve(unsigned long a0,
error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
@@ -10810,7 +11100,7 @@
- signal_64.o ptrace32.o \
+ signal_64.o \
paca.o cpu_setup_ppc970.o \
- firmware.o sysfs.o
+ firmware.o sysfs.o nvram_64.o
obj-$(CONFIG_PPC64) += vdso64/
--- linux-2.6/arch/powerpc/kernel/asm-offsets.c.utrace-ptrace-compat
+++ linux-2.6/arch/powerpc/kernel/asm-offsets.c
@@ -14906,7 +15196,7 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/smp.h>
-@@ -363,7 +363,7 @@ void __kprobes do_single_step(struct pt_
+@@ -360,7 +360,7 @@ void __kprobes do_single_step(struct pt_
SIGTRAP) == NOTIFY_STOP){
return;
}
@@ -14915,7 +15205,7 @@
force_sig(SIGTRAP, current);
}
-@@ -465,7 +465,7 @@ asmlinkage void illegal_op(struct pt_reg
+@@ -462,7 +462,7 @@ asmlinkage void illegal_op(struct pt_reg
if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
return;
if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
@@ -16197,7 +16487,7 @@
return ret;
--- linux-2.6/arch/x86_64/kernel/process.c.utrace-ptrace-compat
+++ linux-2.6/arch/x86_64/kernel/process.c
-@@ -674,11 +674,6 @@ long sys_execve(char __user *name, char
+@@ -676,11 +676,6 @@ long sys_execve(char __user *name, char
if (IS_ERR(filename))
return error;
error = do_execve(filename, argv, envp, ®s);
@@ -16211,7 +16501,7 @@
}
--- linux-2.6/arch/x86_64/kernel/traps.c.utrace-ptrace-compat
+++ linux-2.6/arch/x86_64/kernel/traps.c
-@@ -921,14 +921,6 @@ asmlinkage void __kprobes do_debug(struc
+@@ -935,14 +935,6 @@ asmlinkage void __kprobes do_debug(struc
*/
if (!user_mode(regs))
goto clear_TF_reenable;
More information about the fedora-cvs-commits
mailing list