um: Fix pointer cast

de379379 · Mickaël Salaün <[email protected]> · 2015-12-22 21:44:01 +01:00

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 <[email protected]>
Cc: Jeff Dike <[email protected]>
Acked-by: Richard Weinberger <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: de3793796f78e293cc0873744a75588c99ed2fdd
Parents: 4ef76753

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/x86/um/signal.c	modified	+1	−1	View file

arch/x86/um/signal.c

View file

diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index e5f854c..14fcd01 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;
 