diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:04 +0000 |
| commit | 8eb52971d4749c0192358e1942ca83d8dc7e686b (patch) | |
| tree | 418db997d718e14be2d5d9436d50985a4616156d /sound | |
| parent | d91fd220833b8a6250ff6abf86c7e66a75655ee7 (diff) | |
| parent | be70188832b22a8f1a49d0e3a3eb2209f9cfdc8a (diff) | |
Merge tag 'v3.10.60' into linux-linaro-lsk
This is the 3.10.60 stable release
Diffstat (limited to 'sound')
| -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 af49721ba0e3..c4ac3c1e19af 100644 --- a/sound/core/pcm_compat.c +++ b/sound/core/pcm_compat.c @@ -206,6 +206,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) || |