diff options
author | Johannes Stezenbach <js@linuxtv.org> | 2005-11-09 00:35:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:03 -0500 |
commit | b90ed914e513a6ad6184f7a46a0df0888dcfc177 (patch) | |
tree | 31c9b27b6140499dc930e47f6dd1d7cbe0893584 /drivers/media/dvb/frontends/or51132.c | |
parent | 5c15c0b4fa850543b8ccfcf93686d24456cc384d (diff) |
[PATCH] dvb: Fix integer overflow bug
Fix integer overflow bug in read_signal_strength() reported by Anthony
Leclerc.
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/frontends/or51132.c')
-rw-r--r-- | drivers/media/dvb/frontends/or51132.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c index fc74c40d6477..78bded861d02 100644 --- a/drivers/media/dvb/frontends/or51132.c +++ b/drivers/media/dvb/frontends/or51132.c | |||
@@ -468,6 +468,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength) | |||
468 | unsigned char snd_buf[2]; | 468 | unsigned char snd_buf[2]; |
469 | u8 rcvr_stat; | 469 | u8 rcvr_stat; |
470 | u16 snr_equ; | 470 | u16 snr_equ; |
471 | u32 signal_strength; | ||
471 | int usK; | 472 | int usK; |
472 | 473 | ||
473 | snd_buf[0]=0x04; | 474 | snd_buf[0]=0x04; |
@@ -503,7 +504,11 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength) | |||
503 | usK = (rcvr_stat & 0x10) ? 3 : 0; | 504 | usK = (rcvr_stat & 0x10) ? 3 : 0; |
504 | 505 | ||
505 | /* The value reported back from the frontend will be FFFF=100% 0000=0% */ | 506 | /* The value reported back from the frontend will be FFFF=100% 0000=0% */ |
506 | *strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000; | 507 | signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000; |
508 | if (signal_strength > 0xffff) | ||
509 | *strength = 0xffff; | ||
510 | else | ||
511 | *strength = signal_strength; | ||
507 | dprintk("read_signal_strength %i\n",*strength); | 512 | dprintk("read_signal_strength %i\n",*strength); |
508 | 513 | ||
509 | return 0; | 514 | return 0; |