diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-09-22 13:37:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-09-22 13:37:06 -0300 |
| commit | e837d85c614e8d6e2d93daed972874ea3a8daec7 (patch) | |
| tree | 6f33d64cc45ad8ee0a1ea469de2f029946a114d7 /drivers/media/pci/cx23885 | |
| parent | e3ea5e94489bc8c711d422dfa311cfa310553a1b (diff) | |
| download | linux-stable-e837d85c614e8d6e2d93daed972874ea3a8daec7.tar.gz linux-stable-e837d85c614e8d6e2d93daed972874ea3a8daec7.tar.bz2 linux-stable-e837d85c614e8d6e2d93daed972874ea3a8daec7.zip | |
[media] cx23885: Fix some smatch warnings
Make sure that it won't go past the config buffers
drivers/media/pci/cx23885/cx23885-dvb.c:1733 dvb_register() warn: buffer overflow 'netup_xc5000_config' 2 <= s32max
drivers/media/pci/cx23885/cx23885-dvb.c:1745 dvb_register() warn: buffer overflow 'netup_stv0367_config' 2 <= s32max
drivers/media/pci/cx23885/cx23885-dvb.c:1752 dvb_register() warn: buffer overflow 'netup_xc5000_config' 2 <= s32max
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx23885')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-dvb.c | 3 | ||||
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 828b54afd59e..818f3c2fc98d 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -1720,6 +1720,9 @@ static int dvb_register(struct cx23885_tsport *port) } break; case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: + if (port->nr > 2) + return 0; + i2c_bus = &dev->i2c_bus[0]; mfe_shared = 1;/* MFE */ port->frontends.gate = 0;/* not clear for me yet */ diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h index 2ebece93d111..a6735afe2269 100644 --- a/drivers/media/pci/cx23885/cx23885.h +++ b/drivers/media/pci/cx23885/cx23885.h @@ -257,7 +257,7 @@ struct cx23885_dmaqueue { struct cx23885_tsport { struct cx23885_dev *dev; - int nr; + unsigned nr; int sram_chno; struct vb2_dvb_frontends frontends; |