diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
| commit | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (patch) | |
| tree | 0311f4c48cfa7ace3940f3db203b930a2c2eaaa5 /arch/x86/um/signal.c | |
| parent | c7b60a89516beb20a352ec85c73a8fccd5becf26 (diff) | |
| parent | bc42f363da213b4bf7c15a2dc87b2b1a85cde867 (diff) | |
Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute fixes for v4.4
A few final fixes for v4.4, the main one being the two patches to the
new Sky Lake drivers which fix a previous incorrect fix that went in
during an earlier -rc.
Diffstat (limited to 'arch/x86/um/signal.c')
| -rw-r--r-- | arch/x86/um/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |