]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: ddbridge: fix possible buffer overflow in ddb_ports_init()
authorDaniel Scheller <d.scheller@gmx.net>
Sat, 12 Aug 2017 11:55:57 +0000 (07:55 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Sun, 20 Aug 2017 11:07:19 +0000 (07:07 -0400)
Report from smatch:

  drivers/media/pci/ddbridge/ddbridge-core.c:2659 ddb_ports_init() error: buffer overflow 'dev->port' 32 <= u32max

Fix by making sure "p" is greater than zero before checking for
"dev->port[].type == DDB_CI_EXTERNAL_XO2".

Cc: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Tested-by: Richard Scobie <r.scobie@clear.net.nz>
Tested-by: Jasmin Jessich <jasmin@anw.at>
Tested-by: Dietmar Spingler <d_spingler@freenet.de>
Tested-by: Manfred Knick <Manfred.Knick@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/ddbridge/ddbridge-core.c

index 759a53e822528760f51a1377dc5813b25249d07b..5df942f4e3881d10abef163e87e75f71c19b3372 100644 (file)
@@ -2551,7 +2551,7 @@ void ddb_ports_init(struct ddb *dev)
                        port->dvb[0].adap = &dev->adap[2 * p];
                        port->dvb[1].adap = &dev->adap[2 * p + 1];
 
-                       if ((port->class == DDB_PORT_NONE) && i &&
+                       if ((port->class == DDB_PORT_NONE) && i && p &&
                            dev->port[p - 1].type == DDB_CI_EXTERNAL_XO2) {
                                port->class = DDB_PORT_CI;
                                port->type = DDB_CI_EXTERNAL_XO2_B;