|
@@ -248,18 +248,17 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|
|
if (config_enabled(CONFIG_X86_64))
|
|
|
sp -= 128;
|
|
|
|
|
|
- if (!onsigstack) {
|
|
|
- /* This is the X/Open sanctioned signal stack switching. */
|
|
|
- if (ka->sa.sa_flags & SA_ONSTACK) {
|
|
|
- if (current->sas_ss_size)
|
|
|
- sp = current->sas_ss_sp + current->sas_ss_size;
|
|
|
- } else if (config_enabled(CONFIG_X86_32) &&
|
|
|
- (regs->ss & 0xffff) != __USER_DS &&
|
|
|
- !(ka->sa.sa_flags & SA_RESTORER) &&
|
|
|
- ka->sa.sa_restorer) {
|
|
|
- /* This is the legacy signal stack switching. */
|
|
|
- sp = (unsigned long) ka->sa.sa_restorer;
|
|
|
- }
|
|
|
+ /* This is the X/Open sanctioned signal stack switching. */
|
|
|
+ if (ka->sa.sa_flags & SA_ONSTACK) {
|
|
|
+ if (sas_ss_flags(sp) == 0)
|
|
|
+ sp = current->sas_ss_sp + current->sas_ss_size;
|
|
|
+ } else if (config_enabled(CONFIG_X86_32) &&
|
|
|
+ !onsigstack &&
|
|
|
+ (regs->ss & 0xffff) != __USER_DS &&
|
|
|
+ !(ka->sa.sa_flags & SA_RESTORER) &&
|
|
|
+ ka->sa.sa_restorer) {
|
|
|
+ /* This is the legacy signal stack switching. */
|
|
|
+ sp = (unsigned long) ka->sa.sa_restorer;
|
|
|
}
|
|
|
|
|
|
if (fpu->fpstate_active) {
|