ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
authorTakashi Iwai <tiwai@suse.de>
Tue, 28 Oct 2014 11:42:19 +0000 (12:42 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 14 Dec 2014 16:23:52 +0000 (16:23 +0000)
commit 317168d0c766defd14b3d0e9c2c4a9a258b803ee upstream.

In compat mode, we copy each field of snd_pcm_status struct but don't
touch the reserved fields, and this leaves uninitialized values
there.  Meanwhile the native ioctl does zero-clear the whole
structure, so we should follow the same rule in compat mode, too.

Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
sound/core/pcm_compat.c

index 91cdf94..4dbb66e 100644 (file)
@@ -204,6 +204,8 @@ static int snd_pcm_status_user_compat(struct snd_pcm_substream *substream,
        if (err < 0)
                return err;
 
        if (err < 0)
                return err;
 
+       if (clear_user(src, sizeof(*src)))
+               return -EFAULT;
        if (put_user(status.state, &src->state) ||
            put_user(status.trigger_tstamp.tv_sec, &src->trigger_tstamp.tv_sec) ||
            put_user(status.trigger_tstamp.tv_nsec, &src->trigger_tstamp.tv_nsec) ||
        if (put_user(status.state, &src->state) ||
            put_user(status.trigger_tstamp.tv_sec, &src->trigger_tstamp.tv_sec) ||
            put_user(status.trigger_tstamp.tv_nsec, &src->trigger_tstamp.tv_nsec) ||