]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: seq: Fix missing NULL check at remove_events ioctl
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2016 11:38:02 +0000 (12:38 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 2 Feb 2016 19:09:31 +0000 (19:09 +0000)
commit 030e2c78d3a91dd0d27fef37e91950dde333eba1 upstream.

snd_seq_ioctl_remove_events() calls snd_seq_fifo_clear()
unconditionally even if there is no FIFO assigned, and this leads to
an Oops due to NULL dereference.  The fix is just to add a proper NULL
check.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Tested-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
sound/core/seq/seq_clientmgr.c

index 225c73152ee9e5896c06a3b7f1fbb16095bb5bd2..ab4cd2930ce31e0cbaa43ce0356e0452f7bf79ac 100644 (file)
@@ -1962,7 +1962,7 @@ static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,
                 * No restrictions so for a user client we can clear
                 * the whole fifo
                 */
-               if (client->type == USER_CLIENT)
+               if (client->type == USER_CLIENT && client->data.user.fifo)
                        snd_seq_fifo_clear(client->data.user.fifo);
        }