Unverified Commit fbaada49 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14124 media: cx24116: prevent overflows on SNR calculus 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VG5X7B4DDP4EZKY4YSWLFPYHPPL63QMQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB5AVY 
 
Link:https://gitee.com/openeuler/kernel/pulls/14124

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 003aa085 2db8290f

drivers/media/dvb-frontends/cx24116.c

+6 −1
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ static int cx24116_read_snr_pct(struct dvb_frontend *fe, u16 *snr) 
{

	struct cx24116_state *state = fe->demodulator_priv;

	u8 snr_reading;

	int ret;

	static const u32 snr_tab[] = { /* 10 x Table (rounded up) */

		0x00000, 0x0199A, 0x03333, 0x04ccD, 0x06667,

		0x08000, 0x0999A, 0x0b333, 0x0cccD, 0x0e667,
@@ -749,7 +750,11 @@ static int cx24116_read_snr_pct(struct dvb_frontend *fe, u16 *snr) 


	dprintk("%s()\n", __func__);



	snr_reading = cx24116_readreg(state, CX24116_REG_QUALITY0);

	ret = cx24116_readreg(state, CX24116_REG_QUALITY0);

	if (ret  < 0)

		return ret;



	snr_reading = ret;



	if (snr_reading >= 0xa0 /* 100% */)

		*snr = 0xffff;