diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
| commit | ab997aaeb9cf7a0da1cecc46c5bb6c7262416917 (patch) | |
| tree | b8a09ed676101a2478d17c1d71da1274293c3c64 /arch/um/sys-i386/signal.c | |
| parent | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (diff) | |
| parent | bd53d1270f51c6cfb53b06c8f93fd42327871d6b (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/sys-i386/signal.c')
| -rw-r--r-- | arch/um/sys-i386/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index 03913ca5d25..4efc69a039d 100644 --- a/arch/um/sys-i386/signal.c +++ b/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; |