diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-01-12 06:38:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-01-12 11:21:48 -0500 |
commit | 030e2c78d3a91dd0d27fef37e91950dde333eba1 (patch) | |
tree | d98816c29d7f5d56428897d83e9174952408114a /sound | |
parent | 5c06d68bc2a174a6b82dce9f100f55173b9a5189 (diff) |
ALSA: seq: Fix missing NULL check at remove_events ioctl
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index b64f20deba90..13cfa815732d 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -1962,7 +1962,7 @@ static int snd_seq_ioctl_remove_events(struct snd_seq_client *client, | |||
1962 | * No restrictions so for a user client we can clear | 1962 | * No restrictions so for a user client we can clear |
1963 | * the whole fifo | 1963 | * the whole fifo |
1964 | */ | 1964 | */ |
1965 | if (client->type == USER_CLIENT) | 1965 | if (client->type == USER_CLIENT && client->data.user.fifo) |
1966 | snd_seq_fifo_clear(client->data.user.fifo); | 1966 | snd_seq_fifo_clear(client->data.user.fifo); |
1967 | } | 1967 | } |
1968 | 1968 | ||