* [PATCH] Input: uinput - fix undefined behavior in uinput_validate_absinfo()
@ 2019-01-14 22:04 Dmitry Torokhov
2019-01-14 22:07 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2019-01-14 22:04 UTC (permalink / raw)
To: linux-input
Cc: Byoungyoung Lee, rydberg, DaeRyong Jeong, syzkaller,
Peter Hutterer, linux-kernel
An integer overflow may arise in uinput_validate_absinfo() if "max - min"
can't be represented by an "int". We should check for overflow before
trying to use the result.
Reported-by: Kyungtae Kim <kt0755@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/misc/uinput.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 8ec483e8688b..26ec603fe220 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -39,6 +39,7 @@
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
+#include <linux/overflow.h>
#include <linux/input/mt.h>
#include "../input-compat.h"
@@ -405,7 +406,7 @@ static int uinput_open(struct inode *inode, struct file *file)
static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
const struct input_absinfo *abs)
{
- int min, max;
+ int min, max, range;
min = abs->minimum;
max = abs->maximum;
@@ -417,7 +418,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
return -EINVAL;
}
- if (abs->flat > max - min) {
+ if (check_sub_overflow(max, min, &range) && abs->flat > range) {
printk(KERN_DEBUG
"%s: abs_flat #%02x out of range: %d (min:%d/max:%d)\n",
UINPUT_NAME, code, abs->flat, min, max);
--
2.20.1.97.g81188d93c3-goog
--
Dmitry
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Input: uinput - fix undefined behavior in uinput_validate_absinfo()
2019-01-14 22:04 [PATCH] Input: uinput - fix undefined behavior in uinput_validate_absinfo() Dmitry Torokhov
@ 2019-01-14 22:07 ` Dmitry Torokhov
2019-01-14 22:41 ` Peter Hutterer
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2019-01-14 22:07 UTC (permalink / raw)
To: linux-input
Cc: Byoungyoung Lee, rydberg, DaeRyong Jeong, syzkaller,
Peter Hutterer, linux-kernel
On Mon, Jan 14, 2019 at 02:04:48PM -0800, Dmitry Torokhov wrote:
> An integer overflow may arise in uinput_validate_absinfo() if "max - min"
> can't be represented by an "int". We should check for overflow before
> trying to use the result.
>
> Reported-by: Kyungtae Kim <kt0755@gmail.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/misc/uinput.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> index 8ec483e8688b..26ec603fe220 100644
> --- a/drivers/input/misc/uinput.c
> +++ b/drivers/input/misc/uinput.c
> @@ -39,6 +39,7 @@
> #include <linux/init.h>
> #include <linux/fs.h>
> #include <linux/miscdevice.h>
> +#include <linux/overflow.h>
> #include <linux/input/mt.h>
> #include "../input-compat.h"
>
> @@ -405,7 +406,7 @@ static int uinput_open(struct inode *inode, struct file *file)
> static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
> const struct input_absinfo *abs)
> {
> - int min, max;
> + int min, max, range;
>
> min = abs->minimum;
> max = abs->maximum;
> @@ -417,7 +418,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
> return -EINVAL;
> }
>
> - if (abs->flat > max - min) {
> + if (check_sub_overflow(max, min, &range) && abs->flat > range) {
This should be !check_sub_overflow(...) of course.
> printk(KERN_DEBUG
> "%s: abs_flat #%02x out of range: %d (min:%d/max:%d)\n",
> UINPUT_NAME, code, abs->flat, min, max);
> --
> 2.20.1.97.g81188d93c3-goog
>
>
> --
> Dmitry
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Input: uinput - fix undefined behavior in uinput_validate_absinfo()
2019-01-14 22:07 ` Dmitry Torokhov
@ 2019-01-14 22:41 ` Peter Hutterer
0 siblings, 0 replies; 3+ messages in thread
From: Peter Hutterer @ 2019-01-14 22:41 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-input, Byoungyoung Lee, rydberg, DaeRyong Jeong, syzkaller,
linux-kernel
On Mon, Jan 14, 2019 at 02:07:56PM -0800, Dmitry Torokhov wrote:
> On Mon, Jan 14, 2019 at 02:04:48PM -0800, Dmitry Torokhov wrote:
> > An integer overflow may arise in uinput_validate_absinfo() if "max - min"
> > can't be represented by an "int". We should check for overflow before
> > trying to use the result.
> >
> > Reported-by: Kyungtae Kim <kt0755@gmail.com>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> > drivers/input/misc/uinput.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> > index 8ec483e8688b..26ec603fe220 100644
> > --- a/drivers/input/misc/uinput.c
> > +++ b/drivers/input/misc/uinput.c
> > @@ -39,6 +39,7 @@
> > #include <linux/init.h>
> > #include <linux/fs.h>
> > #include <linux/miscdevice.h>
> > +#include <linux/overflow.h>
> > #include <linux/input/mt.h>
> > #include "../input-compat.h"
> >
> > @@ -405,7 +406,7 @@ static int uinput_open(struct inode *inode, struct file *file)
> > static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
> > const struct input_absinfo *abs)
> > {
> > - int min, max;
> > + int min, max, range;
> >
> > min = abs->minimum;
> > max = abs->maximum;
> > @@ -417,7 +418,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
> > return -EINVAL;
> > }
> >
> > - if (abs->flat > max - min) {
> > + if (check_sub_overflow(max, min, &range) && abs->flat > range) {
>
> This should be !check_sub_overflow(...) of course.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> with that in place,
thanks.
Cheers,
Peter
> > printk(KERN_DEBUG
> > "%s: abs_flat #%02x out of range: %d (min:%d/max:%d)\n",
> > UINPUT_NAME, code, abs->flat, min, max);
> > --
> > 2.20.1.97.g81188d93c3-goog
> >
> >
> > --
> > Dmitry
>
> --
> Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-14 22:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-14 22:04 [PATCH] Input: uinput - fix undefined behavior in uinput_validate_absinfo() Dmitry Torokhov
2019-01-14 22:07 ` Dmitry Torokhov
2019-01-14 22:41 ` Peter Hutterer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).