Input: make sure input handlers define only one processing method
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 3 Jul 2024 21:37:49 +0000 (14:37 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 8 Jul 2024 23:22:48 +0000 (16:22 -0700)
Input core expects input handlers to be either filters, or regular
handlers, but not both. Additionally, for regular handlers it does
not make sense to define both single event method and batch method.

Refuse registering handler if it defines more than one method.

Reviewed-by: Jeff LaBundy <jeff@labundy.com>
Reviewed-by: Benjamin Tissoires <bentiss@kernel.org>
Link: https://lore.kernel.org/r/20240703213756.3375978-3-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/input.c

index fd4997ba263c75240a9de7c08568443ae68e3505..7e4f8824f4fdfaf49e9e79abdb47d4171177904d 100644 (file)
@@ -2517,6 +2517,26 @@ void input_unregister_device(struct input_dev *dev)
 }
 EXPORT_SYMBOL(input_unregister_device);
 
+static int input_handler_check_methods(const struct input_handler *handler)
+{
+       int count = 0;
+
+       if (handler->filter)
+               count++;
+       if (handler->events)
+               count++;
+       if (handler->event)
+               count++;
+
+       if (count > 1) {
+               pr_err("%s: only one event processing method can be defined (%s)\n",
+                      __func__, handler->name);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 /**
  * input_register_handler - register a new input handler
  * @handler: handler to be registered
@@ -2530,6 +2550,10 @@ int input_register_handler(struct input_handler *handler)
        struct input_dev *dev;
        int error;
 
+       error = input_handler_check_methods(handler);
+       if (error)
+               return error;
+
        error = mutex_lock_interruptible(&input_mutex);
        if (error)
                return error;