[PATCH 2.6.32 52/55] ALSA: seq: Fix missing NULL check at remove_events ioctl

From	Willy Tarreau <w@1wt.eu>
Newsgroups	linux.kernel
Subject	[PATCH 2.6.32 52/55] ALSA: seq: Fix missing NULL check at remove_events ioctl
Date	2016-03-04 17:10 +0100
Message-ID	<r90sG-Ls-29@gated-at.bofh.it> (permalink)
References	<r90sF-Ls-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: Takashi Iwai <tiwai@suse.de>

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: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 sound/core/seq/seq_clientmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 84aac18..95169c7 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1947,7 +1947,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);
 	}
 
-- 
1.7.12.2.21.g234cd45.dirty

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2.6.32 52/55] ALSA: seq: Fix missing NULL check at remove_events  ioctl Willy Tarreau <w@1wt.eu> - 2016-03-04 17:10 +0100

csiph-web