diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:08:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:08:32 -0700 |
| commit | f357a82048ff1e5645861475b014570e11ad1911 (patch) | |
| tree | a3ca0cf7b1638d3e8b0a1cb5815af43dd6e0c2c3 /arch/x86/ia32 | |
| parent | b20c99eb668f10b855a9fd87e0a2f5db3fb3637d (diff) | |
| parent | bd1c149aa9915b9abb6d83d0f01dfd2ace0680b5 (diff) | |
| download | linux-f357a82048ff1e5645861475b014570e11ad1911.tar.bz2 | |
Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 SMAP fixes from Ingo Molnar:
"Fixes for Intel SMAP support, to fix SIGSEGVs during bootup"
* 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Introduce [compat_]save_altstack_ex() to unbreak x86 SMAP
x86, smap: Handle csum_partial_copy_*_user()
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index bccfca68430e..665a730307f2 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c @@ -457,7 +457,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, else put_user_ex(0, &frame->uc.uc_flags); put_user_ex(0, &frame->uc.uc_link); - err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp); + compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp); if (ksig->ka.sa.sa_flags & SA_RESTORER) restorer = ksig->ka.sa.sa_restorer; |