Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3257
b: refs/heads/master
c: 350d5bd
h: refs/heads/master
i:
  3255: 014cdd6
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jun 25, 2005
1 parent 42ba534 commit a0af60f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a96206559a8c3a18478a6288ac426d716bbd99c
refs/heads/master: 350d5bd84ecda038bb482ab5f2596bdca68109d9
2 changes: 1 addition & 1 deletion trunk/arch/um/sys-i386/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a0af60f

Please sign in to comment.