kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] uml: x86_64 fixes

Browse source 
This fixes some x86_64 bugs -

- maybe_map returns -1 on error instead of 0, which is interpreted as
  physical address 0

- removed an include of ipc.h, which isn't needed

- fixed the calculation of signal frame location

- the signal delivery code is now immune to the stack expansion check

- added a missing include

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2005-05-06 21:30:55 -07:00 committed by Linus Torvalds
parent 0f7e663dea
commit 2d58cc9a43
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/um/kernel/skas/uaccess.c
View file

@ -29,9 +29,12 @@ static unsigned long maybe_map(unsigned long virt, int is_write)
if(IS_ERR(phys) || (is_write && !pte_write(pte))){ if(IS_ERR(phys) || (is_write && !pte_write(pte))){
err = handle_page_fault(virt, 0, is_write, 1, &dummy_code); err = handle_page_fault(virt, 0, is_write, 1, &dummy_code);
if(err) if(err)
return(0); return(-1UL);
phys = um_virt_to_phys(current, virt, NULL); phys = um_virt_to_phys(current, virt, NULL);
} }
if(IS_ERR(phys))
phys = (void *) -1;
return((unsigned long) phys); return((unsigned long) phys);
} }
@ -42,7 +45,7 @@ static int do_op(unsigned long addr, int len, int is_write,
int n; int n;
addr = maybe_map(addr, is_write); addr = maybe_map(addr, is_write);
if(addr == -1) if(addr == -1UL)
return(-1); return(-1);
page = phys_to_page(addr); page = phys_to_page(addr);

1
arch/um/kernel/syscall_kern.c
View file

@ -17,7 +17,6 @@
#include "linux/utime.h" #include "linux/utime.h"
#include "asm/mman.h" #include "asm/mman.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "asm/ipc.h"
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h" #include "user_util.h"
#include "sysdep/syscalls.h" #include "sysdep/syscalls.h"

2
arch/um/kernel/trap_kern.c
View file

@ -48,7 +48,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
goto good_area; goto good_area;
else if(!(vma->vm_flags & VM_GROWSDOWN)) else if(!(vma->vm_flags & VM_GROWSDOWN))
goto out; goto out;
else if(!ARCH_IS_STACKGROW(address)) else if(is_user && !ARCH_IS_STACKGROW(address))
goto out; goto out;
else if(expand_stack(vma, address)) else if(expand_stack(vma, address))
goto out; goto out;

2
arch/um/sys-x86_64/signal.c
View file

@ -168,7 +168,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
frame = (struct rt_sigframe __user *) frame = (struct rt_sigframe __user *)
round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8; round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;
frame -= 128; ((unsigned char *) frame) -= 128;
if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate))) if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
goto out; goto out;

2
arch/um/sys-x86_64/syscalls.c
View file

@ -44,6 +44,8 @@ long sys_modify_ldt_tt(int func, void *ptr, unsigned long bytecount)
#ifdef CONFIG_MODE_SKAS #ifdef CONFIG_MODE_SKAS
extern int userspace_pid[]; extern int userspace_pid[];
#include "skas_ptrace.h"
long sys_modify_ldt_skas(int func, void *ptr, unsigned long bytecount) long sys_modify_ldt_skas(int func, void *ptr, unsigned long bytecount)
{ {
struct ptrace_ldt ldt; struct ptrace_ldt ldt;