UML - correctly restore extramask in sigreturn
PATCH 1/1 UML - correctly restore extramask in sigreturn
From: Bodo Stroesser <[email protected]>
Restoring of current->blocked in sys_sigreturn is wrong. The first (long ) of the mask correctly is fetched from sc->oldmask. The further longs again come from there, but correctly should be taken from frame->extramask.
Signed-off-by Bodo Stroesser <[email protected]>
Signed-off-by Jeff Dike <[email protected]>
arch/um/sys-i386/signal.c +4 -3
@@ -307,11 +307,12 @@struct sigframe __user *frame = (struct sigframe *)(sp -8 );sigset_t set;struct sigcontext __user *sc = &frame->sc; -unsigned long __user *mask = &sc->oldmask; +unsigned long __user *oldmask = &sc->oldmask; +unsigned long __user *extramask = frame->extramask;int sig_size = (_NSIG_WORDS -1 ) *sizeof (unsigned long ); -if (copy_from_user (&set.sig[0 ], mask,sizeof (&set.sig[0 ])) || -copy_from_user (&set.sig[1 ], mask, sig_size)) +if (copy_from_user (&set.sig[0 ], oldmask,sizeof (&set.sig[0 ])) || +copy_from_user (&set.sig[1 ], extramask, sig_size)) goto segfault;sigdelsetmask (&set, ~_BLOCKABLE);