From a0af60f1f08523123a49f3ac4a24ca304ee09ea0 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 25 Jun 2005 14:55:19 -0700 Subject: [PATCH] --- yaml --- r: 3257 b: refs/heads/master c: 350d5bd84ecda038bb482ab5f2596bdca68109d9 h: refs/heads/master i: 3255: 014cdd6e05e9f2f8744412d18f5f278ff1b40135 v: v3 --- [refs] | 2 +- trunk/arch/um/sys-i386/signal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a048eb0bacd..5e3af9360019 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a96206559a8c3a18478a6288ac426d716bbd99c +refs/heads/master: 350d5bd84ecda038bb482ab5f2596bdca68109d9 diff --git a/trunk/arch/um/sys-i386/signal.c b/trunk/arch/um/sys-i386/signal.c index 03913ca5d256..4efc69a039d7 100644 --- a/trunk/arch/um/sys-i386/signal.c +++ b/trunk/arch/um/sys-i386/signal.c @@ -312,7 +312,7 @@ long sys_sigreturn(struct pt_regs regs) unsigned long __user *extramask = frame->extramask; int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long); - if(copy_from_user(&set.sig[0], oldmask, sizeof(&set.sig[0])) || + if(copy_from_user(&set.sig[0], oldmask, sizeof(set.sig[0])) || copy_from_user(&set.sig[1], extramask, sig_size)) goto segfault;