media: rc: check for integer overflow
authorSean Young <sean@mess.org>
Sun, 8 Oct 2017 18:18:52 +0000 (14:18 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:40:57 +0000 (08:40 +0000)
commit 3e45067f94bbd61dec0619b1c32744eb0de480c8 upstream.

The ioctl LIRC_SET_REC_TIMEOUT would set a timeout of 704ns if called
with a timeout of 4294968us.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/rc/ir-lirc-codec.c

index d2223c0..4c8f456 100644 (file)
@@ -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);