Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4abf9869 authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds
Browse files

ptrace: change signature of sys_ptrace() and friends 



Since userspace API of ptrace syscall defines @addr and @data as void
pointers, it would be more appropriate to define them as unsigned long in
kernel.  Therefore related functions are changed also.

'unsigned long' is typically used in other places in kernel as an opaque
data type and that using this helps cleaning up a lot of warnings from
sparse.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4b5ed25

include/linux/ptrace.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -108,7 +108,8 @@ extern int ptrace_attach(struct task_struct *tsk); 
extern int ptrace_detach(struct task_struct *, unsigned int);

extern int ptrace_detach(struct task_struct *, unsigned int);

extern void ptrace_disable(struct task_struct *);

extern void ptrace_disable(struct task_struct *);

extern int ptrace_check_attach(struct task_struct *task, int kill);

extern int ptrace_check_attach(struct task_struct *task, int kill);

extern int ptrace_request(struct task_struct *child, long request, long addr, long data);

extern int ptrace_request(struct task_struct *child, long request,

			  unsigned long addr, unsigned long data);

extern void ptrace_notify(int exit_code);

extern void ptrace_notify(int exit_code);

extern void __ptrace_link(struct task_struct *child,

extern void __ptrace_link(struct task_struct *child,

			  struct task_struct *new_parent);

			  struct task_struct *new_parent);
@@ -132,8 +133,10 @@ static inline void ptrace_unlink(struct task_struct *child) 
		__ptrace_unlink(child);

		__ptrace_unlink(child);

}

}





int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);

int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,

int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);

			    unsigned long data);

int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,

			    unsigned long data);





/**

/**

 * task_ptrace - return %PT_* flags that apply to a task

 * task_ptrace - return %PT_* flags that apply to a task

include/linux/syscalls.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -701,7 +701,8 @@ asmlinkage long sys_nfsservctl(int cmd, 
asmlinkage long sys_syslog(int type, char __user *buf, int len);

asmlinkage long sys_syslog(int type, char __user *buf, int len);

asmlinkage long sys_uselib(const char __user *library);

asmlinkage long sys_uselib(const char __user *library);

asmlinkage long sys_ni_syscall(void);

asmlinkage long sys_ni_syscall(void);

asmlinkage long sys_ptrace(long request, long pid, long addr, long data);

asmlinkage long sys_ptrace(long request, long pid, unsigned long addr,

			   unsigned long data);





asmlinkage long sys_add_key(const char __user *_type,

asmlinkage long sys_add_key(const char __user *_type,

			    const char __user *_description,

			    const char __user *_description,

kernel/ptrace.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -404,7 +404,7 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds 
	return copied;

	return copied;

}

}





static int ptrace_setoptions(struct task_struct *child, long data)

static int ptrace_setoptions(struct task_struct *child, unsigned long data)

{

{

	child->ptrace &= ~PT_TRACE_MASK;

	child->ptrace &= ~PT_TRACE_MASK;
@@ -483,7 +483,8 @@ static int ptrace_setsiginfo(struct task_struct *child, const siginfo_t *info) 
#define is_sysemu_singlestep(request)	0

#define is_sysemu_singlestep(request)	0

#endif

#endif





static int ptrace_resume(struct task_struct *child, long request, long data)

static int ptrace_resume(struct task_struct *child, long request,

			 unsigned long data)

{

{

	if (!valid_signal(data))

	if (!valid_signal(data))

		return -EIO;

		return -EIO;
@@ -560,7 +561,7 @@ static int ptrace_regset(struct task_struct *task, int req, unsigned int type, 
#endif

#endif





int ptrace_request(struct task_struct *child, long request,

int ptrace_request(struct task_struct *child, long request,

		   long addr, long data)

		   unsigned long addr, unsigned long data)

{

{

	int ret = -EIO;

	int ret = -EIO;

	siginfo_t siginfo;

	siginfo_t siginfo;
@@ -693,7 +694,8 @@ static struct task_struct *ptrace_get_task_struct(pid_t pid) 
#define arch_ptrace_attach(child)	do { } while (0)

#define arch_ptrace_attach(child)	do { } while (0)

#endif

#endif





SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)

SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,

		unsigned long, data)

{

{

	struct task_struct *child;

	struct task_struct *child;

	long ret;

	long ret;
@@ -734,7 +736,8 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data) 
	return ret;

	return ret;

}

}





int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)

int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,

			    unsigned long data)

{

{

	unsigned long tmp;

	unsigned long tmp;

	int copied;

	int copied;
@@ -745,7 +748,8 @@ int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data) 
	return put_user(tmp, (unsigned long __user *)data);

	return put_user(tmp, (unsigned long __user *)data);

}

}





int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)

int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,

			    unsigned long data)

{

{

	int copied;

	int copied;