public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] dvb-core: fix initialization of feeds list in demux filter
@ 2010-02-07 12:49 Francesco Lavra
  2010-02-07 15:13 ` Andy Walls
  2010-02-08  2:11 ` Mauro Carvalho Chehab
  0 siblings, 2 replies; 18+ messages in thread
From: Francesco Lavra @ 2010-02-07 12:49 UTC (permalink / raw)
  To: linux-media

A DVB demultiplexer device can be used to set up either a PES filter or
a section filter. In the former case, the ts field of the feed union of
struct dmxdev_filter is used, in the latter case the sec field of the
same union is used.
The ts field is a struct list_head, and is currently initialized in the
open() method of the demux device. When for a given demuxer a section
filter is set up, the sec field is played with, thus if a PES filter
needs to be set up after that the ts field will be corrupted, causing a
kernel oops.
This fix moves the list head initialization to
dvb_dmxdev_pes_filter_set(), so that the ts field is properly
initialized every time a PES filter is set up.

Signed-off-by: Francesco Lavra <francescolavra@interfree.it>
Cc: stable <stable@kernel.org>
---

--- a/drivers/media/dvb/dvb-core/dmxdev.c	2010-02-07 13:19:18.000000000 +0100
+++ b/drivers/media/dvb/dvb-core/dmxdev.c	2010-02-07 13:23:39.000000000 +0100
@@ -761,7 +761,6 @@ static int dvb_demux_open(struct inode *
 	dvb_ringbuffer_init(&dmxdevfilter->buffer, NULL, 8192);
 	dmxdevfilter->type = DMXDEV_TYPE_NONE;
 	dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_ALLOCATED);
-	INIT_LIST_HEAD(&dmxdevfilter->feed.ts);
 	init_timer(&dmxdevfilter->timer);
 
 	dvbdev->users++;
@@ -887,6 +886,7 @@ static int dvb_dmxdev_pes_filter_set(str
 	dmxdevfilter->type = DMXDEV_TYPE_PES;
 	memcpy(&dmxdevfilter->params, params,
 	       sizeof(struct dmx_pes_filter_params));
+	INIT_LIST_HEAD(&dmxdevfilter->feed.ts);
 
 	dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_SET);
 



^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2010-02-11  0:50 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-07 12:49 [PATCH] dvb-core: fix initialization of feeds list in demux filter Francesco Lavra
2010-02-07 15:13 ` Andy Walls
2010-02-07 21:21   ` hermann pitton
2010-02-08  2:11 ` Mauro Carvalho Chehab
2010-02-08 12:24   ` Andreas Oberritter
2010-02-08 13:43     ` [PATCH] dvb-core: fix initialization of feeds list in demux filter (Was: Videotext application crashes the kernel due to DVB-demux patch) Chicken Shack
2010-02-08 16:14       ` Linus Torvalds
2010-02-08 17:22         ` Mauro Carvalho Chehab
2010-02-08 18:25         ` Chicken Shack
2010-02-08 19:09           ` Linus Torvalds
2010-02-08 19:20             ` Chicken Shack
2010-02-08 23:30               ` Rudy Zijlstra
     [not found]           ` <E1NeyGg-0000ze-FG@fencepost.gnu.org>
2010-02-09 22:34             ` Chicken Shack
2010-02-09  0:53         ` hermann pitton
2010-02-09  8:38           ` Chicken Shack
2010-02-11  0:50             ` hermann pitton
2010-02-08 16:15       ` Devin Heitmueller
2010-02-08 18:01       ` Alain Kalker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox