Commit d0fcfa7a authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: copy_user fixes

This patch fixes some copy_user bugs:

- kernelspace page faults that happen on behalf of a process are now
  correctly handled

- add copy_user treatment so a fault handler which looks at the faulting
  instruction

- added a note to do the same with the ldt stuff some day
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1a07e8ba
...@@ -88,6 +88,7 @@ extern int arch_fixup(unsigned long address, void *sc_ptr); ...@@ -88,6 +88,7 @@ extern int arch_fixup(unsigned long address, void *sc_ptr);
extern void forward_pending_sigio(int target); extern void forward_pending_sigio(int target);
extern int can_do_skas(void); extern int can_do_skas(void);
extern void arch_init_thread(void); extern void arch_init_thread(void);
extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
extern int __raw(int fd, int complain, int now); extern int __raw(int fd, int complain, int now);
#define raw(fd, complain) __raw((fd), (complain), 1) #define raw(fd, complain) __raw((fd), (complain), 1)
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "asm/pgtable.h" #include "asm/pgtable.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h"
extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr, extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out); pte_t *pte_out);
...@@ -51,37 +52,67 @@ static int do_op(unsigned long addr, int len, int is_write, ...@@ -51,37 +52,67 @@ static int do_op(unsigned long addr, int len, int is_write,
return(n); return(n);
} }
static int buffer_op(unsigned long addr, int len, int is_write, static void do_buffer_op(void *jmpbuf, void *arg_ptr)
int (*op)(unsigned long addr, int len, void *arg),
void *arg)
{ {
va_list args = *((va_list *) arg_ptr);
unsigned long addr = va_arg(args, unsigned long);
int len = va_arg(args, int);
int is_write = va_arg(args, int);
int (*op)(unsigned long, int, void *) = va_arg(args, void *);
void *arg = va_arg(args, void *);
int *res = va_arg(args, int *);
int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len); int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
int remain = len, n; int remain = len, n;
current->thread.fault_catcher = jmpbuf;
n = do_op(addr, size, is_write, op, arg); n = do_op(addr, size, is_write, op, arg);
if(n != 0) if(n != 0){
return(n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
goto out;
}
addr += size; addr += size;
remain -= size; remain -= size;
if(remain == 0) if(remain == 0){
return(0); *res = 0;
goto out;
}
while(addr < ((addr + remain) & PAGE_MASK)){ while(addr < ((addr + remain) & PAGE_MASK)){
n = do_op(addr, PAGE_SIZE, is_write, op, arg); n = do_op(addr, PAGE_SIZE, is_write, op, arg);
if(n != 0) if(n != 0){
return(n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
goto out;
}
addr += PAGE_SIZE; addr += PAGE_SIZE;
remain -= PAGE_SIZE; remain -= PAGE_SIZE;
} }
if(remain == 0) if(remain == 0){
return(0); *res = 0;
goto out;
}
n = do_op(addr, remain, is_write, op, arg); n = do_op(addr, remain, is_write, op, arg);
if(n != 0) if(n != 0)
return(n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
return(0); else *res = 0;
out:
current->thread.fault_catcher = NULL;
}
static int buffer_op(unsigned long addr, int len, int is_write,
int (*op)(unsigned long addr, int len, void *arg),
void *arg)
{
int faulted, res;
faulted = setjmp_wrapper(do_buffer_op, addr, len, is_write, op, arg,
&res);
if(!faulted)
return(res);
return(addr + len - (unsigned long) current->thread.fault_addr);
} }
static int copy_chunk_from_user(unsigned long from, int len, void *arg) static int copy_chunk_from_user(unsigned long from, int len, void *arg)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <setjmp.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/utsname.h> #include <sys/utsname.h>
...@@ -169,6 +170,21 @@ void setup_hostinfo(void) ...@@ -169,6 +170,21 @@ void setup_hostinfo(void)
host.release, host.version, host.machine); host.release, host.version, host.machine);
} }
int setjmp_wrapper(void (*proc)(void *, void *), ...)
{
va_list args;
sigjmp_buf buf;
int n;
n = sigsetjmp(buf, 1);
if(n == 0){
va_start(args, proc);
(*proc)(&buf, &args);
}
va_end(args);
return(n);
}
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically * Emacs will notice this stuff at the end of the file and automatically
......
...@@ -183,15 +183,16 @@ void arch_check_bugs(void) ...@@ -183,15 +183,16 @@ void arch_check_bugs(void)
int arch_handle_signal(int sig, union uml_pt_regs *regs) int arch_handle_signal(int sig, union uml_pt_regs *regs)
{ {
unsigned long ip; unsigned char tmp[2];
/* This is testing for a cmov (0x0f 0x4x) instruction causing a /* This is testing for a cmov (0x0f 0x4x) instruction causing a
* SIGILL in init. * SIGILL in init.
*/ */
if((sig != SIGILL) || (TASK_PID(get_current()) != 1)) return(0); if((sig != SIGILL) || (TASK_PID(get_current()) != 1)) return(0);
ip = UPT_IP(regs); if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))
if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40)) panic("SIGILL in init, could not read instructions!\n");
if((tmp[0] != 0x0f) || ((tmp[1] & 0xf0) != 0x40))
return(0); return(0);
if(host_has_cmov == 0) if(host_has_cmov == 0)
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#ifdef CONFIG_MODE_TT #ifdef CONFIG_MODE_TT
extern int modify_ldt(int func, void *ptr, unsigned long bytecount); extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
/* XXX this needs copy_to_user and copy_from_user */
int sys_modify_ldt_tt(int func, void *ptr, unsigned long bytecount) int sys_modify_ldt_tt(int func, void *ptr, unsigned long bytecount)
{ {
if(verify_area(VERIFY_READ, ptr, bytecount)) return(-EFAULT); if(verify_area(VERIFY_READ, ptr, bytecount)) return(-EFAULT);
......
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