[PATCH] misc m68k __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
b971018bae
Коммит
1e5c374d38
|
@ -221,13 +221,13 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
|
|||
{
|
||||
unsigned long clone_flags;
|
||||
unsigned long newsp;
|
||||
int *parent_tidptr, *child_tidptr;
|
||||
int __user *parent_tidptr, *child_tidptr;
|
||||
|
||||
/* syscall2 puts clone_flags in d1 and usp in d2 */
|
||||
clone_flags = regs->d1;
|
||||
newsp = regs->d2;
|
||||
parent_tidptr = (int *)regs->d3;
|
||||
child_tidptr = (int *)regs->d4;
|
||||
parent_tidptr = (int __user *)regs->d3;
|
||||
child_tidptr = (int __user *)regs->d4;
|
||||
if (!newsp)
|
||||
newsp = rdusp();
|
||||
return do_fork(clone_flags, newsp, regs, 0,
|
||||
|
@ -361,7 +361,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
|
|||
/*
|
||||
* sys_execve() executes a new program.
|
||||
*/
|
||||
asmlinkage int sys_execve(char *name, char **argv, char **envp)
|
||||
asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp)
|
||||
{
|
||||
int error;
|
||||
char * filename;
|
||||
|
|
|
@ -326,13 +326,13 @@ static inline int do_040writeback1(unsigned short wbs, unsigned long wba,
|
|||
|
||||
switch (wbs & WBSIZ_040) {
|
||||
case BA_SIZE_BYTE:
|
||||
res = put_user(wbd & 0xff, (char *)wba);
|
||||
res = put_user(wbd & 0xff, (char __user *)wba);
|
||||
break;
|
||||
case BA_SIZE_WORD:
|
||||
res = put_user(wbd & 0xffff, (short *)wba);
|
||||
res = put_user(wbd & 0xffff, (short __user *)wba);
|
||||
break;
|
||||
case BA_SIZE_LONG:
|
||||
res = put_user(wbd, (int *)wba);
|
||||
res = put_user(wbd, (int __user *)wba);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче