diff options
| author | Sean Young <sean@mess.org> | 2021-01-19 14:53:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-07 11:27:42 +0100 |
| commit | 9a1e55f23ed1a85e189b70011ebc9330735f3e7d (patch) | |
| tree | 1d9b5b5e5df47db8012a3ff3bce4173907e3711c | |
| parent | 8efb3733cb158f17c63ee4774ddfd5fcead22390 (diff) | |
| download | linux-9a1e55f23ed1a85e189b70011ebc9330735f3e7d.tar.gz linux-9a1e55f23ed1a85e189b70011ebc9330735f3e7d.tar.bz2 linux-9a1e55f23ed1a85e189b70011ebc9330735f3e7d.zip | |
media: mceusb: sanity check for prescaler value
commit 9dec0f48a75e0dadca498002d25ef4e143e60194 upstream.
prescaler larger than 8 would mean the carrier is at most 152Hz,
which does not make sense for IR carriers.
Reported-by: syzbot+6d31bf169a8265204b8d@syzkaller.appspotmail.com
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/rc/mceusb.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index bf7aaff3aa37..bbbbfd697f9c 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -630,11 +630,18 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, u8 *buf, int buf_len, data[0], data[1]); break; case MCE_RSP_EQIRCFS: + if (!data[0] && !data[1]) { + dev_dbg(dev, "%s: no carrier", inout); + break; + } + // prescaler should make sense + if (data[0] > 8) + break; period = DIV_ROUND_CLOSEST((1U << data[0] * 2) * (data[1] + 1), 10); if (!period) break; - carrier = (1000 * 1000) / period; + carrier = USEC_PER_SEC / period; dev_dbg(dev, "%s carrier of %u Hz (period %uus)", inout, carrier, period); break; |