diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-07 20:04:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-07 20:04:49 -0400 |
| commit | 3de2403e6659d71b36ec820dc9b942762ddfe6eb (patch) | |
| tree | 55516c669ffc2cbe9fd52c3a4d2d6f8e90d4644a /arch/sparc/kernel/sys_sparc.c | |
| parent | e0164af66b6ec165836d1d862b3f800890713452 (diff) | |
| parent | 1e38c126c9252b612697e34f43b1b3371c8ee31d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* 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.
Diffstat (limited to 'arch/sparc/kernel/sys_sparc.c')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index f188b5dc9fd0..e995491c4436 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c | |||
| @@ -223,8 +223,7 @@ int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) | |||
| 223 | { | 223 | { |
| 224 | if (ARCH_SUN4C_SUN4 && | 224 | if (ARCH_SUN4C_SUN4 && |
| 225 | (len > 0x20000000 || | 225 | (len > 0x20000000 || |
| 226 | ((flags & MAP_FIXED) && | 226 | (addr < 0xe0000000 && addr + len > 0x20000000))) |
| 227 | addr < 0xe0000000 && addr + len > 0x20000000))) | ||
| 228 | return -EINVAL; | 227 | return -EINVAL; |
| 229 | 228 | ||
| 230 | /* See asm-sparc/uaccess.h */ | 229 | /* See asm-sparc/uaccess.h */ |