powerpc signal __user annotations
PATCH 6/17 powerpc signal __user annotations
Date: 1138789689 -0500
Signed-off-by Al Viro <[email protected]>
---
arch/powerpc/kernel/signal_32.c | 18 +++++++----------- arch/powerpc/kernel/signal_64.c | 4 ++-- include/asm-powerpc/compat.h | 5 +++++ 3 files changed, 14 insertions(+), 13 deletions(-)
29e646df7829e41a6b0db32fd50ae6376640cd13
arch/powerpc/kernel/signal_32.c +7 -11
@@ -142,11 +142,7 @@ static inline int get_old_sigaction(strureturn 0 ; } -static inline compat_uptr_t to_user_ptr (void *kp) -{ -return (compat_uptr_t )(u64 )kp; -} - +#define to_user_ptr (p) ptr_to_compat(p)#define from_user_ptr (p) compat_ptr(p) static inline int save_general_regs(struct pt_regs *regs,
@@ -213,8 +209,8 @@ static inline int get_old_sigaction(strureturn 0 ; } -#define to_user_ptr (p) (p) -#define from_user_ptr (p) (p) +#define to_user_ptr (p) ((unsigned long)(p)) +#define from_user_ptr (p) ((void __user *)(p))static inline int save_general_regs (struct pt_regs *regs,struct mcontext __user *frame)
@@ -526,7 +522,7 @@ long compat_sys_rt_sigaction(int sig, co ret =do_sigaction (sig, act ? &new_ka :NULL , oact ? &old_ka :NULL );if (!ret && oact) { - ret =put_user ((long )old_ka.sa.sa_handler, &oact->sa_handler); + ret =put_user (to_user_ptr (old_ka.sa.sa_handler), &oact->sa_handler); ret |=put_sigset_t (&oact->sa_mask, &old_ka.sa.sa_mask); ret |=__put_user (old_ka.sa.sa_flags, &oact->sa_flags); }
@@ -675,8 +671,8 @@ long compat_sys_rt_sigqueueinfo(u32 pid,int compat_sys_sigaltstack (u32 __new,u32 __old,int r5,int r6,int r7,int r8,struct pt_regs *regs) { -stack_32_t __user * newstack = (stack_32_t __user *)(long ) __new; -stack_32_t __user * oldstack = (stack_32_t __user *)(long ) __old; +stack_32_t __user * newstack =compat_ptr (__new); +stack_32_t __user * oldstack =compat_ptr (__old);stack_t uss, uoss;int ret;mm_segment_t old_fs;
@@ -708,7 +704,7 @@ int compat_sys_sigaltstack(u32 __new, u3set_fs (old_fs);/* Copy the stack information to the user output buffer */ if (!ret && oldstack && - (put_user ((long )uoss.ss_sp, &oldstack->ss_sp) || + (put_user (ptr_to_compat (uoss.ss_sp), &oldstack->ss_sp) ||__put_user (uoss.ss_flags, &oldstack->ss_flags) ||__put_user (uoss.ss_size, &oldstack->ss_size)))return -EFAULT ;
arch/powerpc/kernel/signal_64.c +2 -2
@@ -60,8 +60,8 @@ struct rt_sigframe {struct ucontext uc;unsigned long _unused[2 ];unsigned int tramp[TRAMP_SIZE ]; -struct siginfo *pinfo; -void *puc; +struct siginfo __user *pinfo; +void __user *puc;struct siginfo info;/* 64 bit ABI allows for 288 bytes below sp before decrementing it. */ char abigap[288 ];
include/asm-powerpc/compat.h +5 -0
@@ -126,6 +126,11 @@ static inline void __user *compat_ptr(coreturn (void __user *)(unsigned long )uptr; } +static inline compat_uptr_t ptr_to_compat (void __user *uptr) +{ +return (u32 )(unsigned long )uptr; +} +static inline void __user *compat_alloc_user_space (long len) {struct pt_regs *regs = current->thread.regs;
Signature · 1 line
0.99.9.GIT