diff options
| author | Sean Young <sean@mess.org> | 2017-10-08 14:18:52 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-10-11 12:41:52 -0400 |
| commit | 3e45067f94bbd61dec0619b1c32744eb0de480c8 (patch) | |
| tree | e071cc135ce004cde9bdc1ac79344105b0831718 /drivers | |
| parent | 5ce8c7a0e6945fdd48ed99cfcfcc25568c1e5960 (diff) | |
| download | lwn-3e45067f94bbd61dec0619b1c32744eb0de480c8.tar.gz lwn-3e45067f94bbd61dec0619b1c32744eb0de480c8.zip | |
media: rc: check for integer overflow
The ioctl LIRC_SET_REC_TIMEOUT would set a timeout of 704ns if called
with a timeout of 4294968us.
Cc: <stable@vger.kernel.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/rc/ir-lirc-codec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index bd046c41a53a..8f2f37412fc5 100644 --- a/drivers/media/rc/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c @@ -298,11 +298,14 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd, if (!dev->max_timeout) return -ENOTTY; + /* Check for multiply overflow */ + if (val > U32_MAX / 1000) + return -EINVAL; + tmp = val * 1000; - if (tmp < dev->min_timeout || - tmp > dev->max_timeout) - return -EINVAL; + if (tmp < dev->min_timeout || tmp > dev->max_timeout) + return -EINVAL; if (dev->s_timeout) ret = dev->s_timeout(dev, tmp); |