Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 09:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: ddbridge: fix buffer overflow in max_set_input_unlocked()

Browse Source 
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>
This commit is contained in:
Daniel Scheller 2017-07-09 15:42:45 -04:00 committed by Mauro Carvalho Chehab
parent bb4cec96e5
commit b9a92f62c5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/pci/ddbridge/ddbridge-maxs8.c
View File

@ -187,11 +187,12 @@ static int max_set_input_unlocked(struct dvb_frontend *fe, int in)
return -EINVAL; return -EINVAL;
if (dvb->input != in) { if (dvb->input != in) {
u32 bit = (1ULL << input->nr); 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; 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); res = dvb->set_input(fe, in);
return res; return res;