diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-09-11 06:11:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-06 08:24:39 -0400 |
commit | 48cafec9a941c2dfe94d76642662bc20bf87fe08 (patch) | |
tree | 135943901bfccdb6a8e260fed60c6583fcc8021b /drivers/media/rc/redrat3.c | |
parent | a52eb6c02fa27efb5f8980312785fce1f77377e2 (diff) |
[media] rc: divide by zero bugs in s_tx_carrier()
"carrier" comes from a get_user() in ir_lirc_ioctl(). We need to test
that it's not zero before using it as a divisor. It might have been
nice to test for this ir_lirc_ioctl() but the mceusb driver uses zero to
disable carrier modulation.
The bug in redrat3 is a little more subtle. The ->carrier is passed to
mod_freq_to_val() which uses it as a divisor.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/redrat3.c')
-rw-r--r-- | drivers/media/rc/redrat3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c index 49731b1a9c57..9f5a17bb5ef5 100644 --- a/drivers/media/rc/redrat3.c +++ b/drivers/media/rc/redrat3.c | |||
@@ -890,6 +890,9 @@ static int redrat3_set_tx_carrier(struct rc_dev *rcdev, u32 carrier) | |||
890 | struct device *dev = rr3->dev; | 890 | struct device *dev = rr3->dev; |
891 | 891 | ||
892 | rr3_dbg(dev, "Setting modulation frequency to %u", carrier); | 892 | rr3_dbg(dev, "Setting modulation frequency to %u", carrier); |
893 | if (carrier == 0) | ||
894 | return -EINVAL; | ||
895 | |||
893 | rr3->carrier = carrier; | 896 | rr3->carrier = carrier; |
894 | 897 | ||
895 | return carrier; | 898 | return carrier; |