[PARISC] Arch-specific compat signals (f671c45d) · Commits · 戴 / test

arch/parisc/kernel/ptrace.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
	int copied;		int copied;

	#ifdef __LP64__		#ifdef __LP64__
	if (is_compat_task(child)) {		if (personality(child->personality) == PER_LINUX32) {
	unsigned int tmp;		unsigned int tmp;

	addr &= 0xffffffffL;		addr &= 0xffffffffL;
	@@ -123,7 +123,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
	case PTRACE_POKEDATA:		case PTRACE_POKEDATA:
	ret = 0;		ret = 0;
	#ifdef __LP64__		#ifdef __LP64__
	if (is_compat_task(child)) {		if (personality(child->personality) == PER_LINUX32) {
	unsigned int tmp = (unsigned int)data;		unsigned int tmp = (unsigned int)data;
	DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n",		DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n",
	request == PTRACE_POKETEXT ? "TEXT" : "DATA",		request == PTRACE_POKETEXT ? "TEXT" : "DATA",
	@@ -146,7 +146,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
	case PTRACE_PEEKUSR: {		case PTRACE_PEEKUSR: {
	ret = -EIO;		ret = -EIO;
	#ifdef __LP64__		#ifdef __LP64__
	if (is_compat_task(child)) {		if (personality(child->personality) == PER_LINUX32) {
	unsigned int tmp;		unsigned int tmp;

	if (addr & (sizeof(int)-1))		if (addr & (sizeof(int)-1))
	@@ -205,7 +205,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
	goto out_tsk;		goto out_tsk;
	}		}
	#ifdef __LP64__		#ifdef __LP64__
	if (is_compat_task(child)) {		if (personality(child->personality) == PER_LINUX32) {
	if (addr & (sizeof(int)-1))		if (addr & (sizeof(int)-1))
	goto out_tsk;		goto out_tsk;
	if ((addr = translate_usr_offset(addr)) < 0)		if ((addr = translate_usr_offset(addr)) < 0)

arch/parisc/kernel/signal.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -317,7 +317,7 @@ setup_rt_frame(int sig, struct k_sigaction ka, siginfo_t info,

	if(personality(current->personality) == PER_LINUX32) {		if(personality(current->personality) == PER_LINUX32) {
	DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);		DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
	err \|= compat_copy_siginfo_to_user(&compat_frame->info, info);		err \|= copy_siginfo_to_user32(&compat_frame->info, info);
	DBG(1,"SETUP_RT_FRAME: 1\n");		DBG(1,"SETUP_RT_FRAME: 1\n");
	compat_val = (compat_int_t)current->sas_ss_sp;		compat_val = (compat_int_t)current->sas_ss_sp;
	err \|= __put_user(compat_val, &compat_frame->uc.uc_stack.ss_sp);		err \|= __put_user(compat_val, &compat_frame->uc.uc_stack.ss_sp);

arch/parisc/kernel/signal32.c

+101 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/errno.h>		#include <linux/errno.h>

	#include <asm/compat_signal.h>
	#include <asm/uaccess.h>		#include <asm/uaccess.h>

	#include "signal32.h"		#include "signal32.h"
	@@ -398,3 +397,104 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __

	return err;		return err;
	}		}

			int
			copy_siginfo_from_user32 (siginfo_t to, compat_siginfo_t __user from)
			{
			unsigned long tmp;
			int err;

			if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t)))
			return -EFAULT;

			err = __get_user(to->si_signo, &from->si_signo);
			err \|= __get_user(to->si_errno, &from->si_errno);
			err \|= __get_user(to->si_code, &from->si_code);

			if (to->si_code < 0)
			err \|= __copy_from_user(&to->_sifields._pad, &from->_sifields._pad, SI_PAD_SIZE);
			else {
			switch (to->si_code >> 16) {
			case __SI_CHLD >> 16:
			err \|= __get_user(to->si_utime, &from->si_utime);
			err \|= __get_user(to->si_stime, &from->si_stime);
			err \|= __get_user(to->si_status, &from->si_status);
			default:
			err \|= __get_user(to->si_pid, &from->si_pid);
			err \|= __get_user(to->si_uid, &from->si_uid);
			break;
			case __SI_FAULT >> 16:
			err \|= __get_user(tmp, &from->si_addr);
			to->si_addr = (void __user *) tmp;
			break;
			case __SI_POLL >> 16:
			err \|= __get_user(to->si_band, &from->si_band);
			err \|= __get_user(to->si_fd, &from->si_fd);
			break;
			case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
			case __SI_MESGQ >> 16:
			err \|= __get_user(to->si_pid, &from->si_pid);
			err \|= __get_user(to->si_uid, &from->si_uid);
			err \|= __get_user(to->si_int, &from->si_int);
			break;
			}
			}
			return err;
			}

			int
			copy_siginfo_to_user32 (compat_siginfo_t __user to, siginfo_t from)
			{
			unsigned int addr;
			int err;

			if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
			return -EFAULT;

			/* If you change siginfo_t structure, please be sure
			this code is fixed accordingly.
			It should never copy any pad contained in the structure
			to avoid security leaks, but must copy the generic
			3 ints plus the relevant union member.
			This routine must convert siginfo from 64bit to 32bit as well
			at the same time. */
			err = __put_user(from->si_signo, &to->si_signo);
			err \|= __put_user(from->si_errno, &to->si_errno);
			err \|= __put_user((short)from->si_code, &to->si_code);
			if (from->si_code < 0)
			err \|= __copy_to_user(&to->_sifields._pad, &from->_sifields._pad, SI_PAD_SIZE);
			else {
			switch (from->si_code >> 16) {
			case __SI_CHLD >> 16:
			err \|= __put_user(from->si_utime, &to->si_utime);
			err \|= __put_user(from->si_stime, &to->si_stime);
			err \|= __put_user(from->si_status, &to->si_status);
			default:
			err \|= __put_user(from->si_pid, &to->si_pid);
			err \|= __put_user(from->si_uid, &to->si_uid);
			break;
			case __SI_FAULT >> 16:
			/* avoid type-checking warnings by copying _pad[0] in lieu of si_addr... */
			err \|= __put_user(from->_sifields._pad[0], &to->si_addr);
			break;
			case __SI_POLL >> 16:
			err \|= __put_user(from->si_band, &to->si_band);
			err \|= __put_user(from->si_fd, &to->si_fd);
			break;
			case __SI_TIMER >> 16:
			err \|= __put_user(from->si_tid, &to->si_tid);
			err \|= __put_user(from->si_overrun, &to->si_overrun);
			addr = (unsigned long) from->si_ptr;
			err \|= __put_user(addr, &to->si_ptr);
			break;
			case __SI_RT >> 16: /* Not generated by the kernel as of now. */
			case __SI_MESGQ >> 16:
			err \|= __put_user(from->si_uid, &to->si_uid);
			err \|= __put_user(from->si_pid, &to->si_pid);
			addr = (unsigned long) from->si_ptr;
			err \|= __put_user(addr, &to->si_ptr);
			break;
			}
			}
			return err;
			}

arch/parisc/kernel/signal32.h

+125 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,34 @@
	#define _PARISC64_KERNEL_SIGNAL32_H		#define _PARISC64_KERNEL_SIGNAL32_H

	#include <linux/compat.h>		#include <linux/compat.h>
	#include <asm/compat_signal.h>
	#include <asm/compat_rt_sigframe.h>		typedef compat_uptr_t compat_sighandler_t;

			typedef struct compat_sigaltstack {
			compat_uptr_t ss_sp;
			compat_int_t ss_flags;
			compat_size_t ss_size;
			} compat_stack_t;

			/* Most things should be clean enough to redefine this at will, if care
			is taken to make libc match. */

			struct compat_sigaction {
			compat_sighandler_t sa_handler;
			compat_uint_t sa_flags;
			compat_sigset_t sa_mask; /* mask last for extensibility */
			};

			/* 32-bit ucontext as seen from an 64-bit kernel */
			struct compat_ucontext {
			compat_uint_t uc_flags;
			compat_uptr_t uc_link;
			compat_stack_t uc_stack; /* struct compat_sigaltstack (12 bytes)*/
			/* FIXME: Pad out to get uc_mcontext to start at an 8-byte aligned boundary */
			compat_uint_t pad[1];
			struct compat_sigcontext uc_mcontext;
			compat_sigset_t uc_sigmask; /* mask last for extensibility */
			};

	/* ELF32 signal handling */		/* ELF32 signal handling */

	@@ -29,6 +55,103 @@ struct k_sigaction32 {
	struct compat_sigaction sa;		struct compat_sigaction sa;
	};		};

			typedef struct compat_siginfo {
			int si_signo;
			int si_errno;
			int si_code;

			union {
			int _pad[((128/sizeof(int)) - 3)];

			/* kill() */
			struct {
			unsigned int _pid; /* sender's pid */
			unsigned int _uid; /* sender's uid */
			} _kill;

			/* POSIX.1b timers */
			struct {
			compat_timer_t _tid; /* timer id */
			int _overrun; /* overrun count */
			char _pad[sizeof(unsigned int) - sizeof(int)];
			compat_sigval_t _sigval; /* same as below */
			int _sys_private; /* not to be passed to user */
			} _timer;

			/* POSIX.1b signals */
			struct {
			unsigned int _pid; /* sender's pid */
			unsigned int _uid; /* sender's uid */
			compat_sigval_t _sigval;
			} _rt;

			/* SIGCHLD */
			struct {
			unsigned int _pid; /* which child */
			unsigned int _uid; /* sender's uid */
			int _status; /* exit code */
			compat_clock_t _utime;
			compat_clock_t _stime;
			} _sigchld;

			/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
			struct {
			unsigned int _addr; /* faulting insn/memory ref. */
			} _sigfault;

			/* SIGPOLL */
			struct {
			int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
			int _fd;
			} _sigpoll;
			} _sifields;
			} compat_siginfo_t;

			int copy_siginfo_to_user32 (compat_siginfo_t __user to, siginfo_t from);
			int copy_siginfo_from_user32 (siginfo_t to, compat_siginfo_t __user from);

			/* In a deft move of uber-hackery, we decide to carry the top half of all
			* 64-bit registers in a non-portable, non-ABI, hidden structure.
			* Userspace can read the hidden structure if it wants but is never
			* guaranteed to be in the same place. Infact the uc_sigmask from the
			* ucontext_t structure may push the hidden register file downards
			*/
			struct compat_regfile {
			/* Upper half of all the 64-bit registers that were truncated
			on a copy to a 32-bit userspace */
			compat_int_t rf_gr[32];
			compat_int_t rf_iasq[2];
			compat_int_t rf_iaoq[2];
			compat_int_t rf_sar;
			};

			#define COMPAT_SIGRETURN_TRAMP 4
			#define COMPAT_SIGRESTARTBLOCK_TRAMP 5
			#define COMPAT_TRAMP_SIZE (COMPAT_SIGRETURN_TRAMP + \
			COMPAT_SIGRESTARTBLOCK_TRAMP)

			struct compat_rt_sigframe {
			/* XXX: Must match trampoline size in arch/parisc/kernel/signal.c
			Secondary to that it must protect the ERESTART_RESTARTBLOCK
			trampoline we left on the stack (we were bad and didn't
			change sp so we could run really fast.) */
			compat_uint_t tramp[COMPAT_TRAMP_SIZE];
			compat_siginfo_t info;
			struct compat_ucontext uc;
			/* Hidden location of truncated registers, must be last. */
			struct compat_regfile regs;
			};

			/*
			* The 32-bit ABI wants at least 48 bytes for a function call frame:
			* 16 bytes for arg0-arg3, and 32 bytes for magic (the only part of
			* which Linux/parisc uses is sp-20 for the saved return pointer...)
			* Then, the stack pointer must be rounded to a cache line (64 bytes).
			*/
			#define SIGFRAME32 64
			#define FUNCTIONCALLFRAME32 48
			#define PARISC_RT_SIGFRAME_SIZE32 (((sizeof(struct compat_rt_sigframe) + FUNCTIONCALLFRAME32) + SIGFRAME32) & -SIGFRAME32)

	void sigset_32to64(sigset_t s64, compat_sigset_t s32);		void sigset_32to64(sigset_t s64, compat_sigset_t s32);
	void sigset_64to32(compat_sigset_t s32, sigset_t s64);		void sigset_64to32(compat_sigset_t s32, sigset_t s64);
	int do_sigaltstack32 (const compat_stack_t __user *uss32,		int do_sigaltstack32 (const compat_stack_t __user *uss32,

include/asm-parisc/compat_ucontext.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,6 @@
	#define _ASM_PARISC_COMPAT_UCONTEXT_H		#define _ASM_PARISC_COMPAT_UCONTEXT_H

	#include <linux/compat.h>		#include <linux/compat.h>
	#include<asm/compat_signal.h>

	/* 32-bit ucontext as seen from an 64-bit kernel */		/* 32-bit ucontext as seen from an 64-bit kernel */
	struct compat_ucontext {		struct compat_ucontext {

Admin message