OSDN Git Service

media: ddbridge: fix buffer overflow in max_set_input_unlocked()
authorDaniel Scheller <d.scheller@gmx.net>
Sun, 9 Jul 2017 19:42:45 +0000 (15:42 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Sun, 20 Aug 2017 11:27:35 +0000 (07:27 -0400)
Picked up code parts introduced one smatch error:

  drivers/media/pci/ddbridge/ddbridge-maxs8.c:163 max_set_input_unlocked() error: buffer overflow 'dev->link[port->lnr].lnb.voltage' 4 <= 255

Fix this by clamping the .lnb.voltage array access to 0-3 by "& 3"'ing
dvb->input.

Cc: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/ddbridge/ddbridge-maxs8.c

index a9dc5f9..10716ee 100644 (file)
@@ -187,11 +187,12 @@ static int max_set_input_unlocked(struct dvb_frontend *fe, int in)
                return -EINVAL;
        if (dvb->input != in) {
                u32 bit = (1ULL << input->nr);
-               u32 obit = dev->link[port->lnr].lnb.voltage[dvb->input] & bit;
+               u32 obit =
+                       dev->link[port->lnr].lnb.voltage[dvb->input & 3] & bit;
 
-               dev->link[port->lnr].lnb.voltage[dvb->input] &= ~bit;
+               dev->link[port->lnr].lnb.voltage[dvb->input & 3] &= ~bit;
                dvb->input = in;
-               dev->link[port->lnr].lnb.voltage[dvb->input] |= obit;
+               dev->link[port->lnr].lnb.voltage[dvb->input & 3] |= obit;
        }
        res = dvb->set_input(fe, in);
        return res;