Skip to content

Commit

Permalink
[PARISC] Add is_compat_task() helper
Browse files Browse the repository at this point in the history 
... And convert signal.c and ptrace.c to use it instead of open
coded equivalents.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  • Loading branch information
Kyle McMartin authored and Kyle McMartin committed Jun 27, 2006
1 parent d71624c commit a3ea84f
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
8 changes: 4 additions & 4 deletions arch/parisc/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
int copied;

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

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

if (addr & (sizeof(int)-1))
Expand Down Expand Up @@ -205,7 +205,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
goto out_tsk;
}
#ifdef __LP64__
if (personality(child->personality) == PER_LINUX32) {
if (__is_compat_task(child)) {
if (addr & (sizeof(int)-1))
goto out_tsk;
if ((addr = translate_usr_offset(addr)) < 0)
Expand Down
20 changes: 10 additions & 10 deletions arch/parisc/kernel/signal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *r
#ifdef __LP64__
compat_sigset_t newset32;

if(personality(current->personality) == PER_LINUX32){
if (is_compat_task()) {
/* XXX: Don't preclude handling different sized sigset_t's. */
if (sigsetsize != sizeof(compat_sigset_t))
return -EINVAL;
Expand Down Expand Up @@ -153,7 +153,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
compat_sigset_t compat_set;
struct compat_rt_sigframe __user * compat_frame;

if(personality(current->personality) == PER_LINUX32)
if (is_compat_task())
sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
#endif

Expand All @@ -166,7 +166,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
#ifdef __LP64__
compat_frame = (struct compat_rt_sigframe __user *)frame;

if(personality(current->personality) == PER_LINUX32){
if (is_compat_task()) {
DBG(2,"sys_rt_sigreturn: ELF32 process.\n");
if (__copy_from_user(&compat_set, &compat_frame->uc.uc_sigmask, sizeof(compat_set)))
goto give_sigsegv;
Expand All @@ -186,7 +186,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)

/* Good thing we saved the old gr[30], eh? */
#ifdef __LP64__
if(personality(current->personality) == PER_LINUX32){
if (is_compat_task()) {
DBG(1,"sys_rt_sigreturn: compat_frame->uc.uc_mcontext 0x%p\n",
&compat_frame->uc.uc_mcontext);
// FIXME: Load upper half from register file
Expand Down Expand Up @@ -315,7 +315,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

compat_frame = (struct compat_rt_sigframe __user *)frame;

if(personality(current->personality) == PER_LINUX32) {
if (is_compat_task()) {
DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
err |= copy_siginfo_to_user32(&compat_frame->info, info);
DBG(1,"SETUP_RT_FRAME: 1\n");
Expand Down Expand Up @@ -392,7 +392,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
haddr = A(ka->sa.sa_handler);
/* The sa_handler may be a pointer to a function descriptor */
#ifdef __LP64__
if(personality(current->personality) == PER_LINUX32) {
if (is_compat_task()) {
#endif
if (haddr & PA_PLABEL_FDESC) {
Elf32_Fdesc fdesc;
Expand Down Expand Up @@ -427,19 +427,19 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
*/
sigframe_size = PARISC_RT_SIGFRAME_SIZE;
#ifdef __LP64__
if(personality(current->personality) == PER_LINUX32)
if (is_compat_task())
sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
#endif
if (in_syscall) {
regs->gr[31] = haddr;
#ifdef __LP64__
if(personality(current->personality) == PER_LINUX)
if (personality(current->personality) == PER_LINUX)
sigframe_size |= 1;
#endif
} else {
unsigned long psw = USER_PSW;
#ifdef __LP64__
if(personality(current->personality) == PER_LINUX)
if (personality(current->personality) == PER_LINUX)
psw |= PSW_W;
#endif

Expand All @@ -464,7 +464,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->gr[26] = sig; /* signal number */

#ifdef __LP64__
if(personality(current->personality) == PER_LINUX32){
if (is_compat_task()) {
regs->gr[25] = A(&compat_frame->info); /* siginfo pointer */
regs->gr[24] = A(&compat_frame->uc); /* ucontext pointer */
} else
Expand Down
11 changes: 11 additions & 0 deletions include/asm-parisc/compat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/personality.h>

#define COMPAT_USER_HZ 100

Expand Down Expand Up @@ -149,4 +150,14 @@ static __inline__ void __user *compat_alloc_user_space(long len)
return (void __user *)regs->gr[30];
}

static inline int __is_compat_task(struct task_struct *t)
{
return personality(t->personality) == PER_LINUX32;
}

static inline int is_compat_task(void)
{
return __is_compat_task(current);
}

#endif /* _ASM_PARISC_COMPAT_H */

0 comments on commit a3ea84f

Please sign in to comment.