linux-um.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] um: Fix pointer cast
@ 2015-12-23 13:17 Mickaël Salaün
  2015-12-23 18:39 ` Richard Weinberger
  0 siblings, 1 reply; 2+ messages in thread
From: Mickaël Salaün @ 2015-12-23 13:17 UTC (permalink / raw)
  To: linux-kernel
  Cc: Mickaël Salaün, Jeff Dike, Richard Weinberger,
	Linus Torvalds, user-mode-linux-devel, Al Viro

Fix a pointer cast typo introduced in v4.4-rc5 especially visible for
the i386 subarchitecture where it results in a kernel crash.

Fixes: 8090bfd2bb9a ("um: Fix fpstate handling")
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
---
 arch/x86/um/signal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] um: Fix pointer cast
  2015-12-23 13:17 [PATCH v2] um: Fix pointer cast Mickaël Salaün
@ 2015-12-23 18:39 ` Richard Weinberger
  0 siblings, 0 replies; 2+ messages in thread
From: Richard Weinberger @ 2015-12-23 18:39 UTC (permalink / raw)
  To: Mickaël Salaün, linux-kernel
  Cc: Jeff Dike, Linus Torvalds, user-mode-linux-devel, Al Viro

Am 23.12.2015 um 14:17 schrieb Mickaël Salaün:
> Fix a pointer cast typo introduced in v4.4-rc5 especially visible for
> the i386 subarchitecture where it results in a kernel crash.
> 
> Fixes: 8090bfd2bb9a ("um: Fix fpstate handling")
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Cc: Jeff Dike <jdike@addtoit.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Al Viro <viro@ZenIV.linux.org.uk>
> ---
>  arch/x86/um/signal.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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;

FYI Linus already merged your patch. :-)
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=de3793796f78e293cc0873744a75588c99ed2fdd

Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-12-23 18:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-23 13:17 [PATCH v2] um: Fix pointer cast Mickaël Salaün
2015-12-23 18:39 ` Richard Weinberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).