Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de379379 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by Linus Torvalds
Browse files

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: 8090bfd2 ("um: Fix fpstate handling")
Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Cc: Jeff Dike <jdike@addtoit.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ef76753

arch/x86/um/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -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;