Input: do not use WARN() in input_alloc_absinfo()
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 6 Aug 2018 22:10:40 +0000 (15:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Sep 2018 07:45:30 +0000 (09:45 +0200)
[ Upstream commit 100294cee9a98bfd4d6cb2d1c8a8aef0e959b0c4 ]

Some of fuzzers set panic_on_warn=1 so that they can handle WARN()ings
the same way they handle full-blown kernel crashes. We used WARN() in
input_alloc_absinfo() to get a better idea where memory allocation
failed, but since then kmalloc() and friends started dumping call stack on
memory allocation failures anyway, so we are not getting anything extra
from WARN().

Because of the above, let's replace WARN with dev_err(). We use dev_err()
instead of simply removing message and relying on kcalloc() to give us
stack dump so that we'd know the instance of hardware device to which we
were trying to attach input device.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/input/input.c

index 762bfb9487dc961cf1c7d12a18a0d10dd3386b4c..50d425fe6706faf84596851a730a0e62b860d1cb 100644 (file)
@@ -480,11 +480,19 @@ EXPORT_SYMBOL(input_inject_event);
  */
 void input_alloc_absinfo(struct input_dev *dev)
 {
-       if (!dev->absinfo)
-               dev->absinfo = kcalloc(ABS_CNT, sizeof(*dev->absinfo),
-                                       GFP_KERNEL);
+       if (dev->absinfo)
+               return;
 
-       WARN(!dev->absinfo, "%s(): kcalloc() failed?\n", __func__);
+       dev->absinfo = kcalloc(ABS_CNT, sizeof(*dev->absinfo), GFP_KERNEL);
+       if (!dev->absinfo) {
+               dev_err(dev->dev.parent ?: &dev->dev,
+                       "%s: unable to allocate memory\n", __func__);
+               /*
+                * We will handle this allocation failure in
+                * input_register_device() when we refuse to register input
+                * device with ABS bits but without absinfo.
+                */
+       }
 }
 EXPORT_SYMBOL(input_alloc_absinfo);