Commit 7ed20e1a authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] convert that currently tests _NSIG directly to use valid_signal() 



Convert most of the current code that uses _NSIG directly to instead use
valid_signal().  This avoids gcc -W warnings and off-by-one errors.

Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e5bdd883

arch/alpha/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/user.h>

#include <linux/slab.h>

#include <linux/security.h>

#include <linux/signal.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -335,7 +336,7 @@ do_sys_ptrace(long request, long pid, long addr, long data, 
		/* continue and stop at next (return from) syscall */

	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);
@@ -365,7 +366,7 @@ do_sys_ptrace(long request, long pid, long addr, long data, 


	case PTRACE_SINGLESTEP:  /* execute single instruction. */

		ret = -EIO;

		if ((unsigned long) data > _NSIG)

		if (!valid_signal(data))

			break;

		/* Mark single stepping.  */

		child->thread_info->bpt_nsaved = -1;

arch/arm/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/user.h>

#include <linux/security.h>

#include <linux/init.h>

#include <linux/signal.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -693,7 +694,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
		case PTRACE_SYSCALL:

		case PTRACE_CONT:

			ret = -EIO;

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

			if (request == PTRACE_SYSCALL)

				set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
@@ -728,7 +729,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
		 */

		case PTRACE_SINGLESTEP:

			ret = -EIO;

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

			child->ptrace |= PT_SINGLESTEP;

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

arch/arm26/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/ptrace.h>

#include <linux/user.h>

#include <linux/security.h>

#include <linux/signal.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -591,7 +592,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
		case PTRACE_SYSCALL:

		case PTRACE_CONT:

			ret = -EIO;

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

			if (request == PTRACE_SYSCALL)

				set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
@@ -626,7 +627,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat 
		 */

		case PTRACE_SINGLESTEP:

			ret = -EIO;

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

			child->ptrace |= PT_SINGLESTEP;

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

arch/cris/arch-v10/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/errno.h>

#include <linux/ptrace.h>

#include <linux/user.h>

#include <linux/signal.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -184,7 +185,7 @@ sys_ptrace(long request, long pid, long addr, long data) 
		case PTRACE_CONT:

			ret = -EIO;

			

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

                        

			if (request == PTRACE_SYSCALL) {
@@ -219,7 +220,7 @@ sys_ptrace(long request, long pid, long addr, long data) 
		case PTRACE_SINGLESTEP:

			ret = -EIO;

			

			if ((unsigned long) data > _NSIG)

			if (!valid_signal(data))

				break;

			

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

arch/frv/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/user.h>

#include <linux/config.h>

#include <linux/security.h>

#include <linux/signal.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -239,7 +240,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) 
	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */

	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);
@@ -267,7 +268,7 @@ asmlinkage int sys_ptrace(long request, long pid, 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);

		ptrace_enable(child);

CRA Git | Maintained and supported by SUSTech CRA and CCSE