Commit 966e803a authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: unify ptrace_user.h 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a10c95d8

arch/um/include/shared/ptrace_user.h

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
#ifndef __PTRACE_USER_H__

#define __PTRACE_USER_H__



#include "sysdep/ptrace_user.h"

#include <sys/ptrace.h>

#include <sysdep/ptrace_user.h>



extern int ptrace_getregs(long pid, unsigned long *regs_out);

extern int ptrace_setregs(long pid, unsigned long *regs_in);

arch/um/os-Linux/skas/process.c

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <errno.h>

#include <string.h>

#include <sys/mman.h>

#include <sys/ptrace.h>

#include <sys/wait.h>

#include <asm/unistd.h>

#include "as-layout.h"
@@ -162,7 +161,7 @@ static void handle_trap(int pid, struct uml_pt_regs *regs, 


	if (!local_using_sysemu)

	{

		err = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET,

		err = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET,

			     __NR_getpid);

		if (err < 0) {

			printk(UM_KERN_ERR "handle_trap - nullifying syscall "

arch/um/os-Linux/start_up.c

+4 −5
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <signal.h>

#include <string.h>

#include <sys/mman.h>

#include <sys/ptrace.h>

#include <sys/stat.h>

#include <sys/wait.h>

#include <asm/unistd.h>
@@ -224,7 +223,7 @@ static void __init check_sysemu(void) 
		goto fail;

	}



	n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, os_getpid());

	n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET, os_getpid());

	if (n < 0) {

		non_fatal("check_sysemu : failed to modify system call "

			  "return");
@@ -260,7 +259,7 @@ static void __init check_sysemu(void) 
					  "doesn't singlestep");

				goto fail;

			}

			n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET,

			n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET,

				   os_getpid());

			if (n < 0)

				fatal_perror("check_sysemu : failed to modify "
@@ -316,10 +315,10 @@ static void __init check_ptrace(void) 
			fatal("check_ptrace : expected (SIGTRAP|0x80), "

			       "got status = %d", status);



		syscall = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_NR_OFFSET,

		syscall = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_NR_OFFSET,

				 0);

		if (syscall == __NR_getpid) {

			n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET,

			n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET,

				   __NR_getppid);

			if (n < 0)

				fatal_perror("check_ptrace : failed to modify "

arch/x86/um/ptrace_64.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const int reg_offsets[] = 
	[FS >> 3] = HOST_FS,

	[GS >> 3] = HOST_GS,

	[EFLAGS >> 3] = HOST_EFLAGS,

	[ORIG_RAX >> 3] = HOST_ORIG_RAX,

	[ORIG_RAX >> 3] = HOST_ORIG_AX,

};



int putreg(struct task_struct *child, int regno, unsigned long value)

arch/x86/um/shared/sysdep/ptrace_64.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
#define REGS_FS(r) ((r)[HOST_FS])

#define REGS_GS(r) ((r)[HOST_GS])



#define REGS_ORIG_RAX(r) ((r)[HOST_ORIG_RAX])

#define REGS_ORIG_RAX(r) ((r)[HOST_ORIG_AX])



#define REGS_SET_SYSCALL_RETURN(r, res) REGS_RAX(r) = (res)