lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Fix fork/clone/vfork system call restart.
  sparc: Fix mmap VA span checking.
This commit is contained in:
Linus Torvalds
2008-05-07 17:04:49 -07:00
parent e0164af66b 1e38c126c9
commit 3de2403e66
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sparc/kernel/process.c
View File

@@ -419,14 +419,26 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
unsigned long stack_size) unsigned long stack_size)
{ {
unsigned long parent_tid_ptr, child_tid_ptr; unsigned long parent_tid_ptr, child_tid_ptr;
unsigned long orig_i1 = regs->u_regs[UREG_I1];
long ret;
parent_tid_ptr = regs->u_regs[UREG_I2]; parent_tid_ptr = regs->u_regs[UREG_I2];
child_tid_ptr = regs->u_regs[UREG_I4]; child_tid_ptr = regs->u_regs[UREG_I4];
return do_fork(clone_flags, stack_start, ret = do_fork(clone_flags, stack_start,
regs, stack_size, regs, stack_size,
(int __user *) parent_tid_ptr, (int __user *) parent_tid_ptr,
(int __user *) child_tid_ptr); (int __user *) child_tid_ptr);
/* If we get an error and potentially restart the system
* call, we're screwed because copy_thread() clobbered
* the parent's %o1. So detect that case and restore it
* here.
*/
if ((unsigned long)ret >= -ERESTART_RESTARTBLOCK)
regs->u_regs[UREG_I1] = orig_i1;
return ret;
} }
/* Copy a Sparc thread. The fork() return value conventions /* Copy a Sparc thread. The fork() return value conventions

3
arch/sparc/kernel/sys_sparc.c
View File

@@ -223,8 +223,7 @@ int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
{ {
if (ARCH_SUN4C_SUN4 && if (ARCH_SUN4C_SUN4 &&
(len > 0x20000000 || (len > 0x20000000 ||
((flags & MAP_FIXED) && (addr < 0xe0000000 && addr + len > 0x20000000)))
addr < 0xe0000000 && addr + len > 0x20000000)))
return -EINVAL; return -EINVAL;
/* See asm-sparc/uaccess.h */ /* See asm-sparc/uaccess.h */

18
arch/sparc64/kernel/process.c
View File

@@ -503,6 +503,8 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags,
unsigned long stack_size) unsigned long stack_size)
{ {
int __user *parent_tid_ptr, *child_tid_ptr; int __user *parent_tid_ptr, *child_tid_ptr;
unsigned long orig_i1 = regs->u_regs[UREG_I1];
long ret;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
if (test_thread_flag(TIF_32BIT)) { if (test_thread_flag(TIF_32BIT)) {
@@ -515,9 +517,19 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags,
child_tid_ptr = (int __user *) regs->u_regs[UREG_I4]; child_tid_ptr = (int __user *) regs->u_regs[UREG_I4];
} }
return do_fork(clone_flags, stack_start, ret = do_fork(clone_flags, stack_start,
regs, stack_size, regs, stack_size,
parent_tid_ptr, child_tid_ptr); parent_tid_ptr, child_tid_ptr);
/* If we get an error and potentially restart the system
* call, we're screwed because copy_thread() clobbered
* the parent's %o1. So detect that case and restore it
* here.
*/
if ((unsigned long)ret >= -ERESTART_RESTARTBLOCK)
regs->u_regs[UREG_I1] = orig_i1;
return ret;
} }
/* Copy a Sparc thread. The fork() return value conventions /* Copy a Sparc thread. The fork() return value conventions

4
arch/sparc64/kernel/sys_sparc.c
View File

@@ -549,13 +549,13 @@ int sparc64_mmap_check(unsigned long addr, unsigned long len,
if (len >= STACK_TOP32) if (len >= STACK_TOP32)
return -EINVAL; return -EINVAL;
if ((flags & MAP_FIXED) && addr > STACK_TOP32 - len) if (addr > STACK_TOP32 - len)
return -EINVAL; return -EINVAL;
} else { } else {
if (len >= VA_EXCLUDE_START) if (len >= VA_EXCLUDE_START)
return -EINVAL; return -EINVAL;
if ((flags & MAP_FIXED) && invalid_64bit_range(addr, len)) if (invalid_64bit_range(addr, len))
return -EINVAL; return -EINVAL;
} }