Skip to contentSkip to conversation

Input: avoid calling input_set_abs_val() in the event handling core

PATCH In review Dmitry Torokhov 2 participants 3 messages May 2, 2023

Subsystems (2)
lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

PATCH 1/1 Input: avoid calling input_set_abs_val() in the event handling core

input_abs_set_val() can nominally call input_alloc_absinfo() which may allocate memory with GFP_KERNEL flag. This does not happen when input_abs_set_val() is called by the input core to set current MT slot when handling a new input event, but it trips certain static analyzers.

Rearrange the code to access the relevant structures directly.

---
 drivers/input/input.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/input/input.c +4 -2
index 37e876d45eb9..f791d14ecf23 100644
@@ -190,6 +190,7 @@ static int input_handle_abs_event(struct input_dev *dev,
 				  unsigned int code, int *pval)
 {
 	struct input_mt *mt = dev->mt;
+	bool is_new_slot = false;
 	bool is_mt_event;
 	int *pold;
 
@@ -210,6 +211,7 @@ static int input_handle_abs_event(struct input_dev *dev,
 		pold = &dev->absinfo[code].value;
 	} else if (mt) {
 		pold = &mt->slots[mt->slot].abs[code - ABS_MT_FIRST];
+		is_new_slot = mt->slot != dev->absinfo[ABS_MT_SLOT].value;
 	} else {
 		/*
 		 * Bypass filtering for multi-touch events when
@@ -228,8 +230,8 @@ static int input_handle_abs_event(struct input_dev *dev,
 	}
 
 	/* Flush pending "slot" event */
-	if (is_mt_event && mt && mt->slot != input_abs_get_val(dev, ABS_MT_SLOT)) {
-		input_abs_set_val(dev, ABS_MT_SLOT, mt->slot);
+	if (is_new_slot) {
+		dev->absinfo[ABS_MT_SLOT].value = mt->slot;
 		return INPUT_PASS_TO_HANDLERS | INPUT_SLOT;
 	}
 
Signature · 5 lines
2.40.1.495.gc816e09b53d-goog


-- 
Dmitry
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dmitry Torokhov

input_abs_set_val() can nominally call input_alloc_absinfo() which may allocate memory with GFP_KERNEL flag. This does not happen when input_abs_set_val() is called by the input core to set current MT slot when handling a new input event, but it trips certain static analyzers.

Rearrange the code to access the relevant structures directly.

If git grep is to be believed, this is the only use of input_abs_set_val. Maybe removing that function is an option?

Are there external drivers that rely on this (instead of sending an event)?

Cheers,
Peter

Quoted 41 lines
---
 drivers/input/input.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/input/input.c +4 -2
index 37e876d45eb9..f791d14ecf23 100644
@@ -190,6 +190,7 @@ static int input_handle_abs_event(struct input_dev *dev,
 				  unsigned int code, int *pval)
 {
 	struct input_mt *mt = dev->mt;
+	bool is_new_slot = false;
 	bool is_mt_event;
 	int *pold;
 
@@ -210,6 +211,7 @@ static int input_handle_abs_event(struct input_dev *dev,
 		pold = &dev->absinfo[code].value;
 	} else if (mt) {
 		pold = &mt->slots[mt->slot].abs[code - ABS_MT_FIRST];
+		is_new_slot = mt->slot != dev->absinfo[ABS_MT_SLOT].value;
 	} else {
 		/*
 		 * Bypass filtering for multi-touch events when
@@ -228,8 +230,8 @@ static int input_handle_abs_event(struct input_dev *dev,
 	}
 
 	/* Flush pending "slot" event */
-	if (is_mt_event && mt && mt->slot != input_abs_get_val(dev, ABS_MT_SLOT)) {
-		input_abs_set_val(dev, ABS_MT_SLOT, mt->slot);
+	if (is_new_slot) {
+		dev->absinfo[ABS_MT_SLOT].value = mt->slot;
 		return INPUT_PASS_TO_HANDLERS | INPUT_SLOT;
 	}
 
Signature · 5 lines
2.40.1.495.gc816e09b53d-goog


-- 
Dmitry
author maintainer
#2 lore raw
Quoted 6 lines · Peter Hutterer
Quoted 5 lines · Dmitry Torokhov

input_abs_set_val() can nominally call input_alloc_absinfo() which may allocate memory with GFP_KERNEL flag. This does not happen when input_abs_set_val() is called by the input core to set current MT slot when handling a new input event, but it trips certain static analyzers.

Quoted 6 lines
Quoted 4 lines

Rearrange the code to access the relevant structures directly.

Thanks for the review.

Quoted 3 lines

If git grep is to be believed, this is the only use of input_abs_set_val. Maybe removing that function is an option?

We generate input_abs_[get|set]_<item>() accessors and setters, and there is a couple of users of input_abs_get_val() in the code, so dropping just input_abs_set_val() is kind of hard. It might be useful elsewhere although I have no idea if anyone is actually using it anywhere...

Thanks.

Signature · 1 line
Dmitry