fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 15:00:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: don't check the event time if it's higher than the dispatch time

Browse source 
The dispatch time is taken during libinput_dispatch(), i.e. at the beginning
of an event sequence. We always read all events off the device, so where
events come in while we're inside the main dispatch loop, our event time may
be later than the saved dispatch_time. This causes an uint underflow and our
tdelta > 10 will be true for that case.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-03-22 13:55:34 +10:00
parent f723b28220
commit 95a72990ad
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/evdev.c
View file

@ -1024,6 +1024,7 @@ evdev_note_time_delay(struct evdev_device *device,
{ {
struct libinput *libinput = evdev_libinput_context(device); struct libinput *libinput = evdev_libinput_context(device);
uint32_t tdelta; uint32_t tdelta;
uint32_t eventtime = input_event_time(ev);
/* if we have a current libinput_dispatch() snapshot, compare our /* if we have a current libinput_dispatch() snapshot, compare our
* event time with the one from the snapshot. If we have more than * event time with the one from the snapshot. If we have more than
@ -1031,10 +1032,11 @@ evdev_note_time_delay(struct evdev_device *device,
* where there is no steady event flow and thus SYN_DROPPED may not * where there is no steady event flow and thus SYN_DROPPED may not
* get hit by the kernel despite us being too slow. * get hit by the kernel despite us being too slow.
*/ */
if (libinput->dispatch_time == 0) if (libinput->dispatch_time == 0 ||
eventtime > libinput->dispatch_time)
return; return;
tdelta = us2ms(libinput->dispatch_time - input_event_time(ev)); tdelta = us2ms(libinput->dispatch_time - eventtime);
if (tdelta > 10) { if (tdelta > 10) {
evdev_log_bug_client_ratelimit(device, evdev_log_bug_client_ratelimit(device,
&device->delay_warning_limit, &device->delay_warning_limit,