diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
| commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
| tree | 81dcf756db373444140bb2623584710c628e3048 /arch/x86/kernel/traps_64.c | |
| parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | op-kernel-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip op-kernel-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.gz | |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
| -rw-r--r-- | arch/x86/kernel/traps_64.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 8b5b3b8..7ffc8cf 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c @@ -1130,7 +1130,14 @@ asmlinkage void math_state_restore(void) } clts(); /* Allow maths ops (or we recurse) */ - restore_fpu_checking(&me->thread.xstate->fxsave); + /* + * Paranoid restore. send a SIGSEGV if we fail to restore the state. + */ + if (unlikely(restore_fpu_checking(&me->thread.xstate->fxsave))) { + stts(); + force_sig(SIGSEGV, me); + return; + } task_thread_info(me)->status |= TS_USEDFPU; me->fpu_counter++; } |
