git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
um
/
kernel
/
tt
/
trap_user.c
diff --git
a/arch/um/kernel/tt/trap_user.c
b/arch/um/kernel/tt/trap_user.c
index
7a6dbf5
..
b5d9d64
100644
(file)
--- a/
arch/um/kernel/tt/trap_user.c
+++ b/
arch/um/kernel/tt/trap_user.c
@@
-1,4
+1,4
@@
-/*
+/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
@@
-6,45
+6,57
@@
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
-#include <asm/sigcontext.h>
#include "sysdep/ptrace.h"
#include "sysdep/ptrace.h"
-#include "s
ignal_user
.h"
+#include "s
ysdep/sigcontext
.h"
#include "user_util.h"
#include "kern_util.h"
#include "task.h"
#include "tt.h"
#include "user_util.h"
#include "kern_util.h"
#include "task.h"
#include "tt.h"
+#include "os.h"
void sig_handler_common_tt(int sig, void *sc_ptr)
{
struct sigcontext *sc = sc_ptr;
struct tt_regs save_regs, *r;
void sig_handler_common_tt(int sig, void *sc_ptr)
{
struct sigcontext *sc = sc_ptr;
struct tt_regs save_regs, *r;
-
struct signal_info *info
;
-
int save_errno = errno, is_user
;
+
int save_errno = errno, is_user = 0
;
+
void (*handler)(int, union uml_pt_regs *)
;
- unprotect_kernel_mem();
+ /* This is done because to allow SIGSEGV to be delivered inside a SEGV
+ * handler. This can happen in copy_user, and if SEGV is disabled,
+ * the process will die.
+ */
+ if(sig == SIGSEGV)
+ change_sig(SIGSEGV, 1);
r = &TASK_REGS(get_current())->tt;
r = &TASK_REGS(get_current())->tt;
+ if ( sig == SIGFPE || sig == SIGSEGV ||
+ sig == SIGBUS || sig == SIGILL ||
+ sig == SIGTRAP ) {
+ GET_FAULTINFO_FROM_SC(r->faultinfo, sc);
+ }
save_regs = *r;
save_regs = *r;
- is_user = user_context(SC_SP(sc));
+ if (sc)
+ is_user = user_context(SC_SP(sc));
r->sc = sc;
if(sig != SIGUSR2)
r->syscall = -1;
r->sc = sc;
if(sig != SIGUSR2)
r->syscall = -1;
- change_sig(SIGUSR1, 1);
- info = &sig_info[sig];
- if(!info->is_irq) unblock_signals();
+ handler = sig_info[sig];
+
+ /* unblock SIGALRM, SIGVTALRM, SIGIO if sig isn't IRQ signal */
+ if (sig != SIGIO && sig != SIGWINCH &&
+ sig != SIGVTALRM && sig != SIGALRM)
+ unblock_signals();
-
(*info->handler)
(sig, (union uml_pt_regs *) r);
+
handler
(sig, (union uml_pt_regs *) r);
if(is_user){
interrupt_end();
block_signals();
if(is_user){
interrupt_end();
block_signals();
- change_sig(SIGUSR1, 0);
set_user_mode(NULL);
}
*r = save_regs;
errno = save_errno;
set_user_mode(NULL);
}
*r = save_regs;
errno = save_errno;
- if(is_user) protect_kernel_mem();
}
/*
}
/*