diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 22:27:44 +0200 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 22:27:44 +0200 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /arch/m68knommu/kernel/ptrace.c | |
parent | [SCSI] remove Documentation/DocBook/scsidrivers.tmpl (diff) | |
parent | Linux v2.6.12-rc4 (diff) | |
download | linux-ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672.tar.xz linux-ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672.zip |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'arch/m68knommu/kernel/ptrace.c')
-rw-r--r-- | arch/m68knommu/kernel/ptrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c index 15cf79080b15..9724e1cd82e5 100644 --- a/arch/m68knommu/kernel/ptrace.c +++ b/arch/m68knommu/kernel/ptrace.c @@ -19,6 +19,7 @@ #include <linux/ptrace.h> #include <linux/user.h> #include <linux/config.h> +#include <linux/signal.h> #include <asm/uaccess.h> #include <asm/page.h> @@ -240,7 +241,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) long tmp; ret = -EIO; - if ((unsigned long) data > _NSIG) + if (!valid_signal(data)) break; if (request == PTRACE_SYSCALL) set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); @@ -278,7 +279,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) long tmp; ret = -EIO; - if ((unsigned long) data > _NSIG) + if (!valid_signal(data)) break; clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16); |