diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-05 15:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-05 15:37:22 +0100 |
| commit | 19566b0bd93c34e4941822ed3c0d76a5abddcf82 (patch) | |
| tree | 7e1894610584133feb4ee6e08bb3e05eb3d6acc1 /sound/core | |
| parent | 9161bd0d1cf375492f0a6aa86b3e4c28b070fb7c (diff) | |
| parent | 0725dda207e95ff25f1aa01432250323e0ec49d6 (diff) | |
| download | linux-19566b0bd93c34e4941822ed3c0d76a5abddcf82.tar.gz linux-19566b0bd93c34e4941822ed3c0d76a5abddcf82.tar.bz2 linux-19566b0bd93c34e4941822ed3c0d76a5abddcf82.zip | |
Merge branch 'for-linus' into for-next
This merges the USB-audio disconnect fix and resolves the conflicts
so that we can continue working on development of usb-audio stuff.
Conflicts:
sound/usb/card.c
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_compat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c index 102e8fd1d450..2d957ba63557 100644 --- a/sound/core/pcm_compat.c +++ b/sound/core/pcm_compat.c @@ -210,6 +210,8 @@ static int snd_pcm_status_user_compat(struct snd_pcm_substream *substream, if (err < 0) return err; + if (clear_user(src, sizeof(*src))) + return -EFAULT; if (put_user(status.state, &src->state) || compat_put_timespec(&status.trigger_tstamp, &src->trigger_tstamp) || compat_put_timespec(&status.tstamp, &src->tstamp) || |