Skip to content

L
linux
Commit 7d7f315b authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

PPC32: Start adding __user to mark pointers from userspace. 

This reduces the number of warnings from Linus' `check' program
for stuff in arch/ppc.
parent 5bbcb162
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 99 deletions
arch/ppc/kernel/align.c
View file @ 7d7f315b
...@@ -189,7 +189,7 @@ fix_alignment(struct pt_regs *regs) ...@@ -189,7 +189,7 @@ fix_alignment(struct pt_regs *regs)
#endif #endif
int i, t; int i, t;
int reg, areg; int reg, areg;
unsigned char *addr; unsigned char __user *addr;
union { union {
long l; long l;
float f; float f;
...@@ -252,7 +252,7 @@ fix_alignment(struct pt_regs *regs) ...@@ -252,7 +252,7 @@ fix_alignment(struct pt_regs *regs)
* pt_regs structure is overloaded and is really from the DEAR. * pt_regs structure is overloaded and is really from the DEAR.
*/ */
addr = (unsigned char *)regs->dar; addr = (unsigned char __user *)regs->dar;
/* Verify the address of the operand */ /* Verify the address of the operand */
if (user_mode(regs)) { if (user_mode(regs)) {
......
arch/ppc/kernel/irq.c
View file @ 7d7f315b
...@@ -584,7 +584,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off, ...@@ -584,7 +584,7 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
return sprintf (page, "%08x\n", irq_affinity[(int)data]); return sprintf (page, "%08x\n", irq_affinity[(int)data]);
} }
static unsigned int parse_hex_value (const char *buffer, static unsigned int parse_hex_value (const char __user *buffer,
unsigned long count, unsigned long *ret) unsigned long count, unsigned long *ret)
{ {
unsigned char hexnum [HEX_DIGITS]; unsigned char hexnum [HEX_DIGITS];
...@@ -621,7 +621,7 @@ static unsigned int parse_hex_value (const char *buffer, ...@@ -621,7 +621,7 @@ static unsigned int parse_hex_value (const char *buffer,
return 0; return 0;
} }
static int irq_affinity_write_proc (struct file *file, const char *buffer, static int irq_affinity_write_proc (struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int irq = (int) data, full_count = count, err; int irq = (int) data, full_count = count, err;
...@@ -660,7 +660,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, ...@@ -660,7 +660,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
return sprintf (page, "%08lx\n", *mask); return sprintf (page, "%08lx\n", *mask);
} }
static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
unsigned long *mask = (unsigned long *) data, full_count = count, err; unsigned long *mask = (unsigned long *) data, full_count = count, err;
......
arch/ppc/kernel/ppc_htab.c
View file @ 7d7f315b
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/system.h> #include <asm/system.h>
static ssize_t ppc_htab_read(struct file * file, char * buf, static ssize_t ppc_htab_read(struct file * file, char __user * buf,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
static ssize_t ppc_htab_write(struct file * file, const char * buffer, static ssize_t ppc_htab_write(struct file * file, const char __user * buffer,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
static long long ppc_htab_lseek(struct file * file, loff_t offset, int orig); static long long ppc_htab_lseek(struct file * file, loff_t offset, int orig);
int proc_dol2crvec(ctl_table *table, int write, struct file *filp, int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp); void __user *buffer, size_t *lenp);
extern PTE *Hash, *Hash_end; extern PTE *Hash, *Hash_end;
extern unsigned long Hash_size, Hash_mask; extern unsigned long Hash_size, Hash_mask;
...@@ -109,7 +109,7 @@ static char *pmc2_lookup(unsigned long mmcr0) ...@@ -109,7 +109,7 @@ static char *pmc2_lookup(unsigned long mmcr0)
* is _REALLY_ slow (see the nested for loops below) but nothing * is _REALLY_ slow (see the nested for loops below) but nothing
* in here should be really timing critical. -- Cort * in here should be really timing critical. -- Cort
*/ */
static ssize_t ppc_htab_read(struct file * file, char * buf, static ssize_t ppc_htab_read(struct file * file, char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0; unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
...@@ -211,13 +211,19 @@ static ssize_t ppc_htab_read(struct file * file, char * buf, ...@@ -211,13 +211,19 @@ static ssize_t ppc_htab_read(struct file * file, char * buf,
/* /*
* Allow user to define performance counters and resize the hash table * Allow user to define performance counters and resize the hash table
*/ */
static ssize_t ppc_htab_write(struct file * file, const char * buffer, static ssize_t ppc_htab_write(struct file * file, const char __user * ubuffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
#ifdef CONFIG_PPC_STD_MMU #ifdef CONFIG_PPC_STD_MMU
unsigned long tmp; unsigned long tmp;
char buffer[16];
if ( current->uid != 0 ) if ( current->uid != 0 )
return -EACCES; return -EACCES;
if (strncpy_from_user(buffer, ubuffer, 15))
return -EFAULT;
buffer[15] = 0;
/* don't set the htab size for now */ /* don't set the htab size for now */
if ( !strncmp( buffer, "size ", 5) ) if ( !strncmp( buffer, "size ", 5) )
return -EBUSY; return -EBUSY;
...@@ -387,9 +393,10 @@ ppc_htab_lseek(struct file * file, loff_t offset, int orig) ...@@ -387,9 +393,10 @@ ppc_htab_lseek(struct file * file, loff_t offset, int orig)
} }
int proc_dol2crvec(ctl_table *table, int write, struct file *filp, int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp) void __user *buffer_arg, size_t *lenp)
{ {
int vleft, first=1, len, left, val; int vleft, first=1, len, left, val;
char __user *buffer = (char __user *) buffer_arg;
#define TMPBUFLEN 256 #define TMPBUFLEN 256
char buf[TMPBUFLEN], *p; char buf[TMPBUFLEN], *p;
static const char *sizestrings[4] = { static const char *sizestrings[4] = {
...@@ -422,12 +429,12 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp, ...@@ -422,12 +429,12 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
if (write) { if (write) {
while (left) { while (left) {
char c; char c;
if(get_user(c,(char *) buffer)) if(get_user(c, buffer))
return -EFAULT; return -EFAULT;
if (!isspace(c)) if (!isspace(c))
break; break;
left--; left--;
((char *) buffer)++; buffer++;
} }
if (!left) if (!left)
break; break;
...@@ -474,7 +481,7 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp, ...@@ -474,7 +481,7 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
len = strlen(buf); len = strlen(buf);
if (len > left) if (len > left)
len = left; len = left;
if(copy_to_user(buffer, buf, len)) if (copy_to_user(buffer, buf, len))
return -EFAULT; return -EFAULT;
left -= len; left -= len;
buffer += len; buffer += len;
......
arch/ppc/kernel/process.c
View file @ 7d7f315b
...@@ -441,8 +441,9 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr) ...@@ -441,8 +441,9 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr)
return put_user(val, (unsigned int *) adr); return put_user(val, (unsigned int *) adr);
} }
int sys_clone(unsigned long clone_flags, unsigned long usp, int *parent_tidp, int sys_clone(unsigned long clone_flags, unsigned long usp,
void *child_threadptr, int *child_tidp, int p6, int __user *parent_tidp, void __user *child_threadptr,
int __user *child_tidp, int p6,
struct pt_regs *regs) struct pt_regs *regs)
{ {
CHECK_FULL_REGS(regs); CHECK_FULL_REGS(regs);
...@@ -474,7 +475,7 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, ...@@ -474,7 +475,7 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
int error; int error;
char * filename; char * filename;
filename = getname((char *) a0); filename = getname((char __user *) a0);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
...@@ -484,7 +485,8 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, ...@@ -484,7 +485,8 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
if (regs->msr & MSR_VEC) if (regs->msr & MSR_VEC)
giveup_altivec(current); giveup_altivec(current);
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
error = do_execve(filename, (char **) a1, (char **) a2, regs); error = do_execve(filename, (char __user *__user *) a1,
(char __user *__user *) a2, regs);
if (error == 0) if (error == 0)
current->ptrace &= ~PT_DTRACE; current->ptrace &= ~PT_DTRACE;
putname(filename); putname(filename);
......
arch/ppc/kernel/signal.c
View file @ 7d7f315b
...@@ -83,8 +83,8 @@ sys_sigsuspend(old_sigset_t mask, int p2, int p3, int p4, int p6, int p7, ...@@ -83,8 +83,8 @@ sys_sigsuspend(old_sigset_t mask, int p2, int p3, int p4, int p6, int p7,
} }
int int
sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, int p3, int p4, int p6, sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, int p3, int p4,
int p7, struct pt_regs *regs) int p6, int p7, struct pt_regs *regs)
{ {
sigset_t saveset, newset; sigset_t saveset, newset;
...@@ -115,15 +115,15 @@ sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, int p3, int p4, int p6, ...@@ -115,15 +115,15 @@ sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, int p3, int p4, int p6,
int int
sys_sigaltstack(const stack_t *uss, stack_t *uoss, int r5, int r6, sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, int r5,
int r7, int r8, struct pt_regs *regs) int r6, int r7, int r8, struct pt_regs *regs)
{ {
return do_sigaltstack(uss, uoss, regs->gpr[1]); return do_sigaltstack(uss, uoss, regs->gpr[1]);
} }
int int
sys_sigaction(int sig, const struct old_sigaction *act, sys_sigaction(int sig, const struct old_sigaction __user *act,
struct old_sigaction *oact) struct old_sigaction __user *oact)
{ {
struct k_sigaction new_ka, old_ka; struct k_sigaction new_ka, old_ka;
int ret; int ret;
...@@ -195,14 +195,14 @@ struct rt_sigframe ...@@ -195,14 +195,14 @@ struct rt_sigframe
int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct rt_sigframe *rt_sf; struct rt_sigframe __user *rt_sf;
struct sigcontext sigctx; struct sigcontext sigctx;
struct sigregs *sr; struct sigregs __user *sr;
elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */ elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */
sigset_t set; sigset_t set;
stack_t st; stack_t st;
rt_sf = (struct rt_sigframe *)(regs->gpr[1] + __SIGNAL_FRAMESIZE); rt_sf = (struct rt_sigframe __user *)(regs->gpr[1] + __SIGNAL_FRAMESIZE);
if (copy_from_user(&sigctx, &rt_sf->uc.uc_mcontext, sizeof(sigctx)) if (copy_from_user(&sigctx, &rt_sf->uc.uc_mcontext, sizeof(sigctx))
|| copy_from_user(&set, &rt_sf->uc.uc_sigmask, sizeof(set)) || copy_from_user(&set, &rt_sf->uc.uc_sigmask, sizeof(set))
|| copy_from_user(&st, &rt_sf->uc.uc_stack, sizeof(st))) || copy_from_user(&st, &rt_sf->uc.uc_stack, sizeof(st)))
...@@ -220,7 +220,7 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, ...@@ -220,7 +220,7 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
* preamble frame (where registers are stored) * preamble frame (where registers are stored)
* see handle_signal() * see handle_signal()
*/ */
sr = (struct sigregs *) sigctx.regs; sr = (struct sigregs __user *) sigctx.regs;
if (copy_from_user(saved_regs, &sr->gp_regs, sizeof(sr->gp_regs))) if (copy_from_user(saved_regs, &sr->gp_regs, sizeof(sr->gp_regs)))
goto badframe; goto badframe;
saved_regs[PT_MSR] = (regs->msr & ~MSR_USERCHANGE) saved_regs[PT_MSR] = (regs->msr & ~MSR_USERCHANGE)
...@@ -229,9 +229,6 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, ...@@ -229,9 +229,6 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
if (copy_from_user(current->thread.fpr, &sr->fp_regs, if (copy_from_user(current->thread.fpr, &sr->fp_regs,
sizeof(sr->fp_regs))) sizeof(sr->fp_regs)))
goto badframe; goto badframe;
/* This function sets back the stack flags into
the current task structure. */
sys_sigaltstack(&st, NULL, 0, 0, 0, 0, regs);
sigreturn_exit(regs); /* doesn't return here */ sigreturn_exit(regs); /* doesn't return here */
return 0; return 0;
...@@ -241,10 +238,10 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, ...@@ -241,10 +238,10 @@ int sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
} }
static void static void
setup_rt_frame(struct pt_regs *regs, struct sigregs *frame, setup_rt_frame(struct pt_regs *regs, struct sigregs __user *frame,
signed long newsp) signed long newsp)
{ {
struct rt_sigframe *rt_sf = (struct rt_sigframe *) newsp; struct rt_sigframe __user *rt_sf = (struct rt_sigframe __user *) newsp;
/* Set up preamble frame */ /* Set up preamble frame */
if (verify_area(VERIFY_WRITE, frame, sizeof(*frame))) if (verify_area(VERIFY_WRITE, frame, sizeof(*frame)))
...@@ -270,11 +267,11 @@ setup_rt_frame(struct pt_regs *regs, struct sigregs *frame, ...@@ -270,11 +267,11 @@ setup_rt_frame(struct pt_regs *regs, struct sigregs *frame,
set up registers for signal handler set up registers for signal handler
*/ */
newsp -= __SIGNAL_FRAMESIZE; newsp -= __SIGNAL_FRAMESIZE;
if (put_user(regs->gpr[1], (unsigned long *)newsp) if (put_user(regs->gpr[1], (unsigned long __user *)newsp)
|| get_user(regs->nip, &rt_sf->uc.uc_mcontext.handler) || get_user(regs->nip, &rt_sf->uc.uc_mcontext.handler)
|| get_user(regs->gpr[3], &rt_sf->uc.uc_mcontext.signal) || get_user(regs->gpr[3], &rt_sf->uc.uc_mcontext.signal)
|| get_user(regs->gpr[4], (unsigned long *)&rt_sf->pinfo) || get_user(regs->gpr[4], (unsigned long __user *)&rt_sf->pinfo)
|| get_user(regs->gpr[5], (unsigned long *)&rt_sf->puc)) || get_user(regs->gpr[5], (unsigned long __user *)&rt_sf->puc))
goto badframe; goto badframe;
regs->gpr[1] = newsp; regs->gpr[1] = newsp;
...@@ -297,12 +294,13 @@ setup_rt_frame(struct pt_regs *regs, struct sigregs *frame, ...@@ -297,12 +294,13 @@ setup_rt_frame(struct pt_regs *regs, struct sigregs *frame,
int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct sigcontext *sc, sigctx; struct sigcontext __user *sc;
struct sigregs *sr; struct sigcontext sigctx;
struct sigregs __user *sr;
elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */ elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */
sigset_t set; sigset_t set;
sc = (struct sigcontext *)(regs->gpr[1] + __SIGNAL_FRAMESIZE); sc = (struct sigcontext __user *)(regs->gpr[1] + __SIGNAL_FRAMESIZE);
if (copy_from_user(&sigctx, sc, sizeof(sigctx))) if (copy_from_user(&sigctx, sc, sizeof(sigctx)))
goto badframe; goto badframe;
...@@ -319,7 +317,7 @@ int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, ...@@ -319,7 +317,7 @@ int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
giveup_fpu(current); giveup_fpu(current);
/* restore registers */ /* restore registers */
sr = (struct sigregs *) sigctx.regs; sr = (struct sigregs __user *) sigctx.regs;
if (copy_from_user(saved_regs, &sr->gp_regs, sizeof(sr->gp_regs))) if (copy_from_user(saved_regs, &sr->gp_regs, sizeof(sr->gp_regs)))
goto badframe; goto badframe;
saved_regs[PT_MSR] = (regs->msr & ~MSR_USERCHANGE) saved_regs[PT_MSR] = (regs->msr & ~MSR_USERCHANGE)
...@@ -341,10 +339,10 @@ int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, ...@@ -341,10 +339,10 @@ int sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
* Set up a signal frame. * Set up a signal frame.
*/ */
static void static void
setup_frame(struct pt_regs *regs, struct sigregs *frame, setup_frame(struct pt_regs *regs, struct sigregs __user *frame,
unsigned long newsp) unsigned long newsp)
{ {
struct sigcontext *sc = (struct sigcontext *) newsp; struct sigcontext __user *sc = (struct sigcontext __user *) newsp;
if (verify_area(VERIFY_WRITE, frame, sizeof(*frame))) if (verify_area(VERIFY_WRITE, frame, sizeof(*frame)))
goto badframe; goto badframe;
...@@ -362,7 +360,7 @@ setup_frame(struct pt_regs *regs, struct sigregs *frame, ...@@ -362,7 +360,7 @@ setup_frame(struct pt_regs *regs, struct sigregs *frame,
current->thread.fpscr = 0; /* turn off all fp exceptions */ current->thread.fpscr = 0; /* turn off all fp exceptions */
newsp -= __SIGNAL_FRAMESIZE; newsp -= __SIGNAL_FRAMESIZE;
if (put_user(regs->gpr[1], (unsigned long *)newsp) if (put_user(regs->gpr[1], (unsigned long __user *)newsp)
|| get_user(regs->nip, &sc->handler) || get_user(regs->nip, &sc->handler)
|| get_user(regs->gpr[3], &sc->signal)) || get_user(regs->gpr[3], &sc->signal))
goto badframe; goto badframe;
...@@ -387,8 +385,8 @@ static void ...@@ -387,8 +385,8 @@ static void
handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset, handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
struct pt_regs * regs, unsigned long *newspp, unsigned long frame) struct pt_regs * regs, unsigned long *newspp, unsigned long frame)
{ {
struct sigcontext *sc; struct sigcontext __user *sc;
struct rt_sigframe *rt_sf; struct rt_sigframe __user *rt_sf;
struct k_sigaction *ka = &current->sighand->action[sig-1]; struct k_sigaction *ka = &current->sighand->action[sig-1];
if (TRAP(regs) == 0x0C00 /* System Call! */ if (TRAP(regs) == 0x0C00 /* System Call! */
...@@ -408,7 +406,7 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset, ...@@ -408,7 +406,7 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
if (ka->sa.sa_flags & SA_SIGINFO) { if (ka->sa.sa_flags & SA_SIGINFO) {
/* Put a Real Time Context onto stack */ /* Put a Real Time Context onto stack */
*newspp -= sizeof(*rt_sf); *newspp -= sizeof(*rt_sf);
rt_sf = (struct rt_sigframe *) *newspp; rt_sf = (struct rt_sigframe __user *) *newspp;
if (verify_area(VERIFY_WRITE, rt_sf, sizeof(*rt_sf))) if (verify_area(VERIFY_WRITE, rt_sf, sizeof(*rt_sf)))
goto badframe; goto badframe;
...@@ -432,7 +430,7 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset, ...@@ -432,7 +430,7 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
} else { } else {
/* Put a sigcontext on the stack */ /* Put a sigcontext on the stack */
*newspp -= sizeof(*sc); *newspp -= sizeof(*sc);
sc = (struct sigcontext *) *newspp; sc = (struct sigcontext __user *) *newspp;
if (verify_area(VERIFY_WRITE, sc, sizeof(*sc))) if (verify_area(VERIFY_WRITE, sc, sizeof(*sc)))
goto badframe; goto badframe;
...@@ -516,9 +514,9 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -516,9 +514,9 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
return 0; /* no signals delivered */ return 0; /* no signals delivered */
if (ka->sa.sa_flags & SA_SIGINFO) if (ka->sa.sa_flags & SA_SIGINFO)
setup_rt_frame(regs, (struct sigregs *) frame, newsp); setup_rt_frame(regs, (struct sigregs __user *) frame, newsp);
else else
setup_frame(regs, (struct sigregs *) frame, newsp); setup_frame(regs, (struct sigregs __user *) frame, newsp);
return 1; return 1;
} }
arch/ppc/kernel/syscalls.c
View file @ 7d7f315b
...@@ -52,7 +52,7 @@ check_bugs(void) ...@@ -52,7 +52,7 @@ check_bugs(void)
* This is really horribly ugly. * This is really horribly ugly.
*/ */
int int
sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fifth)
{ {
int version, ret; int version, ret;
...@@ -62,7 +62,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) ...@@ -62,7 +62,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
ret = -EINVAL; ret = -EINVAL;
switch (call) { switch (call) {
case SEMOP: case SEMOP:
ret = sys_semop (first, (struct sembuf *)ptr, second); ret = sys_semop (first, (struct sembuf __user *)ptr, second);
break; break;
case SEMGET: case SEMGET:
ret = sys_semget (first, second, third); ret = sys_semget (first, second, third);
...@@ -73,13 +73,13 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) ...@@ -73,13 +73,13 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
if (!ptr) if (!ptr)
break; break;
if ((ret = verify_area (VERIFY_READ, ptr, sizeof(long))) if ((ret = verify_area (VERIFY_READ, ptr, sizeof(long)))
|| (ret = get_user(fourth.__pad, (void **)ptr))) || (ret = get_user(fourth.__pad, (void *__user *)ptr)))
break; break;
ret = sys_semctl (first, second, third, fourth); ret = sys_semctl (first, second, third, fourth);
break; break;
} }
case MSGSND: case MSGSND:
ret = sys_msgsnd (first, (struct msgbuf *) ptr, second, third); ret = sys_msgsnd (first, (struct msgbuf __user *) ptr, second, third);
break; break;
case MSGRCV: case MSGRCV:
switch (version) { switch (version) {
...@@ -90,15 +90,15 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) ...@@ -90,15 +90,15 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
break; break;
if ((ret = verify_area (VERIFY_READ, ptr, sizeof(tmp))) if ((ret = verify_area (VERIFY_READ, ptr, sizeof(tmp)))
|| (ret = copy_from_user(&tmp, || (ret = copy_from_user(&tmp,
(struct ipc_kludge *) ptr, (struct ipc_kludge __user *) ptr,
sizeof (tmp)) ? -EFAULT : 0)) sizeof (tmp)) ? -EFAULT : 0))
break; break;
ret = sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp, ret = sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp,
third); third);
break; break;
} }
default: default:
ret = sys_msgrcv (first, (struct msgbuf *) ptr, ret = sys_msgrcv (first, (struct msgbuf __user *) ptr,
second, fifth, third); second, fifth, third);
break; break;
} }
...@@ -107,38 +107,28 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) ...@@ -107,38 +107,28 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
ret = sys_msgget ((key_t) first, second); ret = sys_msgget ((key_t) first, second);
break; break;
case MSGCTL: case MSGCTL:
ret = sys_msgctl (first, second, (struct msqid_ds *) ptr); ret = sys_msgctl (first, second, (struct msqid_ds __user *) ptr);
break; break;
case SHMAT: case SHMAT: {
switch (version) { ulong raddr;
default: {
ulong raddr;
if ((ret = verify_area(VERIFY_WRITE, (ulong*) third, if ((ret = verify_area(VERIFY_WRITE, (ulong __user *) third,
sizeof(ulong)))) sizeof(ulong))))
break;
ret = sys_shmat (first, (char *) ptr, second, &raddr);
if (ret)
break;
ret = put_user (raddr, (ulong *) third);
break; break;
} ret = sys_shmat (first, (char __user *) ptr, second, &raddr);
case 1: /* iBCS2 emulator entry point */ if (ret)
if (!segment_eq(get_fs(), get_ds()))
break;
ret = sys_shmat (first, (char *) ptr, second,
(ulong *) third);
break; break;
} ret = put_user (raddr, (ulong __user *) third);
break; break;
}
case SHMDT: case SHMDT:
ret = sys_shmdt ((char *)ptr); ret = sys_shmdt ((char __user *)ptr);
break; break;
case SHMGET: case SHMGET:
ret = sys_shmget (first, second, third); ret = sys_shmget (first, second, third);
break; break;
case SHMCTL: case SHMCTL:
ret = sys_shmctl (first, second, (struct shmid_ds *) ptr); ret = sys_shmctl (first, second, (struct shmid_ds __user *) ptr);
break; break;
} }
...@@ -149,7 +139,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) ...@@ -149,7 +139,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
* sys_pipe() is the normal C calling standard for creating * sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though. * a pipe. It's not the way unix traditionally does this, though.
*/ */
int sys_pipe(int *fildes) int sys_pipe(int __user *fildes)
{ {
int fd[2]; int fd[2];
int error; int error;
...@@ -219,7 +209,7 @@ ppc_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp) ...@@ -219,7 +209,7 @@ ppc_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp)
{ {
if ( (unsigned long)n >= 4096 ) if ( (unsigned long)n >= 4096 )
{ {
unsigned long *buffer = (unsigned long *)n; unsigned long __user *buffer = (unsigned long __user *)n;
if (verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long)) if (verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long))
|| __get_user(n, buffer) || __get_user(n, buffer)
|| __get_user(inp, ((fd_set **)(buffer+1))) || __get_user(inp, ((fd_set **)(buffer+1)))
...@@ -231,7 +221,7 @@ ppc_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp) ...@@ -231,7 +221,7 @@ ppc_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp)
return sys_select(n, inp, outp, exp, tvp); return sys_select(n, inp, outp, exp, tvp);
} }
int sys_uname(struct old_utsname * name) int sys_uname(struct old_utsname __user * name)
{ {
int err = -EFAULT; int err = -EFAULT;
...@@ -242,7 +232,7 @@ int sys_uname(struct old_utsname * name) ...@@ -242,7 +232,7 @@ int sys_uname(struct old_utsname * name)
return err; return err;
} }
int sys_olduname(struct oldold_utsname * name) int sys_olduname(struct oldold_utsname __user * name)
{ {
int error; int error;
......
arch/ppc/kernel/traps.c
View file @ 7d7f315b
...@@ -281,7 +281,7 @@ emulate_instruction(struct pt_regs *regs) ...@@ -281,7 +281,7 @@ emulate_instruction(struct pt_regs *regs)
return retval; return retval;
CHECK_FULL_REGS(regs); CHECK_FULL_REGS(regs);
if (get_user(instword, (uint *)(regs->nip))) if (get_user(instword, (uint __user *)(regs->nip)))
return -EFAULT; return -EFAULT;
/* Emulate the mfspr rD, PVR. /* Emulate the mfspr rD, PVR.
......
include/asm-ppc/ipc.h
View file @ 7d7f315b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* See arch/ppc/kernel/syscalls.c for ugly details.. * See arch/ppc/kernel/syscalls.c for ugly details..
*/ */
struct ipc_kludge { struct ipc_kludge {
struct msgbuf *msgp; struct msgbuf __user *msgp;
long msgtyp; long msgtyp;
}; };
......
include/asm-ppc/uaccess.h
View file @ 7d7f315b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size))) #define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))
#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
extern inline int verify_area(int type, const void * addr, unsigned long size) extern inline int verify_area(int type, const void __user * addr, unsigned long size)
{ {
return access_ok(type,addr,size) ? 0 : -EFAULT; return access_ok(type,addr,size) ? 0 : -EFAULT;
} }
...@@ -225,45 +225,46 @@ do { \ ...@@ -225,45 +225,46 @@ do { \
/* more complex routines */ /* more complex routines */
extern int __copy_tofrom_user(void *to, const void *from, unsigned long size); extern int __copy_tofrom_user(void __user *to, const void __user *from,
unsigned long size);
extern inline unsigned long extern inline unsigned long
copy_from_user(void *to, const void *from, unsigned long n) copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
unsigned long over; unsigned long over;
if (access_ok(VERIFY_READ, from, n)) if (access_ok(VERIFY_READ, from, n))
return __copy_tofrom_user(to, from, n); return __copy_tofrom_user((void __user *)to, from, n);
if ((unsigned long)from < TASK_SIZE) { if ((unsigned long)from < TASK_SIZE) {
over = (unsigned long)from + n - TASK_SIZE; over = (unsigned long)from + n - TASK_SIZE;
return __copy_tofrom_user(to, from, n - over) + over; return __copy_tofrom_user((void __user *)to, from, n - over) + over;
} }
return n; return n;
} }
extern inline unsigned long extern inline unsigned long
copy_to_user(void *to, const void *from, unsigned long n) copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
unsigned long over; unsigned long over;
if (access_ok(VERIFY_WRITE, to, n)) if (access_ok(VERIFY_WRITE, to, n))
return __copy_tofrom_user(to, from, n); return __copy_tofrom_user(to, (void __user *) from, n);
if ((unsigned long)to < TASK_SIZE) { if ((unsigned long)to < TASK_SIZE) {
over = (unsigned long)to + n - TASK_SIZE; over = (unsigned long)to + n - TASK_SIZE;
return __copy_tofrom_user(to, from, n - over) + over; return __copy_tofrom_user(to, (void __user *) from, n - over) + over;
} }
return n; return n;
} }
#define __copy_from_user(to, from, size) \ #define __copy_from_user(to, from, size) \
__copy_tofrom_user((to), (from), (size)) __copy_tofrom_user((void __user *)(to), (from), (size))
#define __copy_to_user(to, from, size) \ #define __copy_to_user(to, from, size) \
__copy_tofrom_user((to), (from), (size)) __copy_tofrom_user((to), (void __user *)(from), (size))
extern unsigned long __clear_user(void *addr, unsigned long size); extern unsigned long __clear_user(void __user *addr, unsigned long size);
extern inline unsigned long extern inline unsigned long
clear_user(void *addr, unsigned long size) clear_user(void __user *addr, unsigned long size)
{ {
if (access_ok(VERIFY_WRITE, addr, size)) if (access_ok(VERIFY_WRITE, addr, size))
return __clear_user(addr, size); return __clear_user(addr, size);
...@@ -274,10 +275,10 @@ clear_user(void *addr, unsigned long size) ...@@ -274,10 +275,10 @@ clear_user(void *addr, unsigned long size)
return size; return size;
} }
extern int __strncpy_from_user(char *dst, const char *src, long count); extern int __strncpy_from_user(char *dst, const char __user *src, long count);
extern inline long extern inline long
strncpy_from_user(char *dst, const char *src, long count) strncpy_from_user(char *dst, const char __user *src, long count)
{ {
if (access_ok(VERIFY_READ, src, 1)) if (access_ok(VERIFY_READ, src, 1))
return __strncpy_from_user(dst, src, count); return __strncpy_from_user(dst, src, count);
...@@ -290,7 +291,7 @@ strncpy_from_user(char *dst, const char *src, long count) ...@@ -290,7 +291,7 @@ strncpy_from_user(char *dst, const char *src, long count)
* Return 0 for error * Return 0 for error
*/ */
extern int __strnlen_user(const char *str, long len, unsigned long top); extern int __strnlen_user(const char __user *str, long len, unsigned long top);
/* /*
* Returns the length of the string at str (including the null byte), * Returns the length of the string at str (including the null byte),
...@@ -300,7 +301,7 @@ extern int __strnlen_user(const char *str, long len, unsigned long top); ...@@ -300,7 +301,7 @@ extern int __strnlen_user(const char *str, long len, unsigned long top);
* The `top' parameter to __strnlen_user is to make sure that * The `top' parameter to __strnlen_user is to make sure that
* we can never overflow from the user area into kernel space. * we can never overflow from the user area into kernel space.
*/ */
extern __inline__ int strnlen_user(const char *str, long len) extern __inline__ int strnlen_user(const char __user *str, long len)
{ {
unsigned long top = __kernel_ok? ~0UL: TASK_SIZE - 1; unsigned long top = __kernel_ok? ~0UL: TASK_SIZE - 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7