summaryrefslogtreecommitdiffstats
path: root/arch/x86/um
diff options
context:
space:
mode:
authorMickaël Salaün <mic@digikod.net>2015-12-22 21:44:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-12-22 15:31:51 -0800
commitde3793796f78e293cc0873744a75588c99ed2fdd (patch)
treebbe8da5a22bfa90702819817de80ac8548d62bb7 /arch/x86/um
parent4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff)
downloadblackbird-op-linux-de3793796f78e293cc0873744a75588c99ed2fdd.tar.gz
blackbird-op-linux-de3793796f78e293cc0873744a75588c99ed2fdd.zip
um: Fix pointer cast
Fix a pointer cast typo introduced in v4.4-rc5 especially visible for the i386 subarchitecture where it results in a kernel crash. [ Also removed pointless cast as per Al Viro - Linus ] Fixes: 8090bfd2bb9a ("um: Fix fpstate handling") Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Jeff Dike <jdike@addtoit.com> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/um')
-rw-r--r--arch/x86/um/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index e5f854ce2d72..14fcd01ed992 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -470,7 +470,7 @@ long sys_sigreturn(void)
struct sigcontext __user *sc = &frame->sc;
int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
- if (copy_from_user(&set.sig[0], (void *)sc->oldmask, sizeof(set.sig[0])) ||
+ if (copy_from_user(&set.sig[0], &sc->oldmask, sizeof(set.sig[0])) ||
copy_from_user(&set.sig[1], frame->extramask, sig_size))
goto segfault;
OpenPOWER on IntegriCloud