Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index ecbccbbf5c2a..19eba9aaedd1 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -18,6 +18,7 @@
 #include <linux/security.h>
 #include <linux/audit.h>
 #include <linux/seccomp.h>
+#include <linux/signal.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -467,7 +468,7 @@ asmlinkage long sys_ptrace(long request, long pid, unsigned long addr, long data
         case PTRACE_CONT:    /* restart after signal. */
 
                 ret = -EIO;
-                if ((unsigned long) data > _NSIG)
+                if (!valid_signal(data))
                         break;
                 if (request == PTRACE_SYSCALL)
                         set_tsk_thread_flag(child,TIF_SYSCALL_TRACE);
@@ -529,7 +530,7 @@ asmlinkage long sys_ptrace(long request, long pid, unsigned long addr, long data
 
         case PTRACE_SINGLESTEP:    /* set the trap flag. */
                 ret = -EIO;
-                if ((unsigned long) data > _NSIG)
+                if (!valid_signal(data))
                         break;
                 clear_tsk_thread_flag(child,TIF_SYSCALL_TRACE);
                 set_singlestep(child);