]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
[media] av7110: wrong limiter in av7110_start_feed()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 18 Oct 2011 05:12:09 +0000 (02:12 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 24 Nov 2011 16:26:02 +0000 (14:26 -0200)
Smatch complains that the wrong limiter is used here:
drivers/media/dvb/ttpci/av7110.c +906 dvb_feed_start_pid(12)
error: buffer overflow 'npids' 5 <= 19

Here is the problem code:
   905          i = dvbdmxfeed->pes_type;
   906          npids[i] = (pid[i]&0x8000) ? 0 : pid[i];

"npids" is a 5 element array declared on the stack.  If
dvbdmxfeed->pes_type is more than 4 we probably put a (u16)0 past
the end of the array.

If dvbdmxfeed->pes_type is over 4 the rest of the function doesn't
do anything.  dvbdmxfeed->pes_type is capped at less than
DMX_TS_PES_OTHER (20) in the caller function, but I changed it to
less than or equal to DMX_TS_PES_PCR (4).

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/ttpci/av7110.c

index 3d20719fce1a114d7c630560235ce53b1e022b4b..abf6b55cf6d5c3bc2fbe024fdf575796e1d02dc3 100644 (file)
@@ -991,7 +991,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
 
        if (feed->type == DMX_TYPE_TS) {
                if ((feed->ts_type & TS_DECODER) &&
-                   (feed->pes_type < DMX_TS_PES_OTHER)) {
+                   (feed->pes_type <= DMX_TS_PES_PCR)) {
                        switch (demux->dmx.frontend->source) {
                        case DMX_MEMORY_FE:
                                if (feed->ts_type & TS_DECODER)