HID: multitouch: Fix stale MT slots when contact count drops to zero
PATCH v3 1/1 HID: multitouch: Fix stale MT slots when contact count drops to zero
The INGENIC 17EF:6161 touchscreen (Lenovo Yoga Book 9 14IAH10) reports HID_DG_CONTACTCOUNT=0 in the frame immediately following the last finger lift rather than omitting the frame entirely. In mt_touch_report() the existing code only updates num_expected when contact_count is non-zero, so a zero contact count on the first packet of a new frame leaves num_expected at its previous value (e.g. 2 for a two-finger gesture). The sync check "num_received >= num_expected" then evaluates "0 >= 2" and never fires, preventing INPUT_MT_DROP_UNUSED from releasing the stale slots. Those slots remain active in the kernel MT layer until the next touch, at which point they are released in a batch alongside the new contact — causing the userspace event consumer to miss the intervening finger-up sequence and corrupt its gesture session state.
Fix by resetting num_expected to 0 when contact_count is zero and num_received is still 0 (i.e., this is the first and only packet of the frame, not a continuation packet in a multi-packet sequence). With num_expected=0 the sync check "0 >= 0" fires immediately, calling input_mt_sync_frame() which drops the stale slots via INPUT_MT_DROP_UNUSED.
The num_received==0 guard is critical: continuation packets in a multi-packet frame arrive after at least one contact has already been processed (num_received>0), so they are correctly excluded from this path and the existing multi-packet logic is unaffected.
---
v3:
- Resend as standalone patch; v2 was sent with incorrect subject "2/5" (as a ping reply to the original series) so it was not recognized as a versioned respin by the maintainers. No code changes from v2.
v2:
- Restructured contact_count block per Benjamin Tissoires' v1 review:
replace three-branch if/else-if/else-if with a cleaner two-branch form, dropping the outer if (contact_count >= 0) wrapper.
- Add prev_scantime != scantime guard to the zero-contact sentinel case.
drivers/hid/hid-multitouch.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/hid/hid-multitouch.c +8 -11
@@ -1321,21 +1321,18 @@ static void mt_touch_report(struct hid_device *hid,* Includes multi-packet support where subsequent * packets are sent with zero contactcount. */ -if (contact_count >=0 ) { +if (contact_count >0 ) + app->num_expected = contact_count; +else if (app->num_received ==0 && app->prev_scantime != scantime) {/* +* New multi-report frame: +* * For Win8 PTPs the first packet (td->num_received == 0) may * have a contactcount of 0 if there only is a button event. -* We double check that this is not a continuation packet -* of a possible multi-packet frame be checking that the -* timestamp has changed. +* +* Some other devices use a sentinel frame with 0 to release all contacts */ -if ((app->quirks &MT_QUIRK_WIN8_PTP_BUTTONS ) && - app->num_received ==0 && - app->prev_scantime != scantime) - app->num_expected = contact_count; -/* A non 0 contact count always indicates a first packet */ -else if (contact_count) - app->num_expected = contact_count; + app->num_expected =0 ; } app->prev_scantime = scantime;
Signature · 1 line
2.55.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Preexisting teardown race condition in mt_remove() where the sticky fingers release timer can be re-armed after deletion, leading to a Use-After-Free. --
--- Patch [1]: [PATCH v3] HID: multitouch: Fix stale MT slots when contact count drops to zero --- commit de5f919b17036295856b898ddbe48949c82b0650
Author: Dave Carey <[email protected]>
HID: multitouch: Fix stale MT slots when contact count drops to zero
The INGENIC 17EF:6161 touchscreen reports a contact count of 0 in the frame immediately following the last finger lift. This commit fixes an issue where the driver left num_expected at its previous value, preventing stale slots from being released. It resolves this by explicitly resetting num_expected to 0 for a new multi-report frame.
Quoted 11 lines
drivers/hid/hid-multitouch.c +2
-1@@ -1321,21 +1321,18 @@ static void mt_touch_report(struct hid_device *hid,* Includes multi-packet support where subsequent * packets are sent with zero contactcount. */ -if (contact_count >=0 ) { +if (contact_count >0 ) + app->num_expected = contact_count;
[ ... ]
drivers/hid/hid-multitouch.c static void mt_touch_report(struct hid_device *hid, · line 1337
Quoted 4 lines
drivers/hid/hid-multitouch.c +1
-0+ app->num_expected =0 ; } app->prev_scantime = scantime;
[Severity: High]
This is a pre-existing issue, but while looking at mt_touch_report(), I noticed a potential race condition during device teardown that might lead to a use-after-free.
In mt_remove(), the release timer is deleted before stopping the hardware:
drivers/hid/hid-multitouch.c:mt_remove() {
...
timer_delete_sync(&td->release_timer);
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
hid_hw_stop(hdev);
...
}Since hid_hw_stop() hasn't been called yet, the hardware is still active and can generate events. If an incoming HID report is processed concurrently by mt_touch_report(), it can re-arm the timer:
drivers/hid/hid-multitouch.c:mt_touch_report() {
...
if (app->quirks & MT_QUIRK_STICKY_FINGERS) {
if (!bitmap_empty(td->active_slots, td->maxcontacts))
mod_timer(&td->release_timer,
jiffies + msecs_to_jiffies(100));
...
}After mt_remove() completes, the devm-managed mt_device structure (td) is freed. If the re-armed timer expires 100ms later, could mt_expired_timeout() execute on the freed td structure?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Benjamin Tissoires
maintainerHi Dave,
Quoted 46 lines · Dave Carey
The INGENIC 17EF:6161 touchscreen (Lenovo Yoga Book 9 14IAH10) reports HID_DG_CONTACTCOUNT=0 in the frame immediately following the last finger lift rather than omitting the frame entirely. In
mt_touch_report()the existing code only updatesnum_expectedwhencontact_countis non-zero, so a zero contact count on the first packet of a new frame leavesnum_expectedat its previous value (e.g. 2 for a two-finger gesture). The sync check "num_received>=num_expected" then evaluates "0 >= 2" and never fires, preventingINPUT_MT_DROP_UNUSEDfrom releasing the stale slots. Those slots remain active in the kernel MT layer until the next touch, at which point they are released in a batch alongside the new contact — causing the userspace event consumer to miss the intervening finger-up sequence and corrupt its gesture session state.Fix by resetting
num_expectedto 0 whencontact_countis zero andnum_receivedis still 0 (i.e., this is the first and only packet of the frame, not a continuation packet in a multi-packet sequence). With num_expected=0 the sync check "0 >= 0" fires immediately, callinginput_mt_sync_frame()which drops the stale slots viaINPUT_MT_DROP_UNUSED.The num_received==0 guard is critical: continuation packets in a multi-packet frame arrive after at least one contact has already been processed (num_received>0), so they are correctly excluded from this path and the existing multi-packet logic is unaffected.
Signed-off-by Dave Carey <[email protected]>Tested-by Dave Carey <[email protected]>---
v3:
- Resend as standalone patch; v2 was sent with incorrect subject "2/5" (as a ping reply to the original series) so it was not recognized as a versioned respin by the maintainers. No code changes from v2.v2:
- Restructuredcontact_countblock per Benjamin Tissoires' v1 review:
replace three-branch if/else-if/else-if with a cleaner two-branch form, dropping the outer if (contact_count>= 0) wrapper.
- Addprev_scantime!= scantime guard to the zero-contact sentinel case.drivers/hid/hid-multitouch.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)drivers/hid/hid-multitouch.c +0
-0
drivers/hid/hid-multitouch.c static void mt_touch_report(struct hid_device *hid, · line 1326
Quoted 7 lines
drivers/hid/hid-multitouch.c +3
-1@@ -1321,21 +1321,18 @@ static void mt_touch_report(struct hid_device *hid,* Includes multi-packet support where subsequent * packets are sent with zero contactcount. */ -if (contact_count >=0 ) { +if (contact_count >0 ) + app->num_expected = contact_count; +else if (app->num_received ==0 && app->prev_scantime != scantime) {
Sorry, I couldn't get back to you with this. I had second thoughts on this patch, and ended up asking claude whether we were having any potential issues. Turns out that we are fine according to all code path it could find to one tiny exception: if there is no HID_DG_CONTACTCOUNT in the report, contact_count is initialized to -1 but will not get a positive or null value. So semantically, the code is misleading, but it's harmless because num_expected would still stay at the value 0.
On the other hand, if the device reports a signed contact count and a negative value, the code with your patch would fix the negative value to be 0, so that's an improvement actually.
Cheers,
Benjamin
Quoted 26 lines
drivers/hid/hid-multitouch.c +5
-10/* +* New multi-report frame: +* * For Win8 PTPs the first packet (td->num_received == 0) may * have a contactcount of 0 if there only is a button event. -* We double check that this is not a continuation packet -* of a possible multi-packet frame be checking that the -* timestamp has changed. +* +* Some other devices use a sentinel frame with 0 to release all contacts */ -if ((app->quirks &MT_QUIRK_WIN8_PTP_BUTTONS ) && - app->num_received ==0 && - app->prev_scantime != scantime) - app->num_expected = contact_count; -/* A non 0 contact count always indicates a first packet */ -else if (contact_count) - app->num_expected = contact_count; + app->num_expected =0 ; } app->prev_scantime = scantime;Signature · 1 line
2.55.0
Quoted 13 lines · Dave Carey
The INGENIC 17EF:6161 touchscreen (Lenovo Yoga Book 9 14IAH10) reports HID_DG_CONTACTCOUNT=0 in the frame immediately following the last finger lift rather than omitting the frame entirely. In
mt_touch_report()the existing code only updatesnum_expectedwhencontact_countis non-zero, so a zero contact count on the first packet of a new frame leavesnum_expectedat its previous value (e.g. 2 for a two-finger gesture). The sync check "num_received>=num_expected" then evaluates "0 >= 2" and never fires, preventingINPUT_MT_DROP_UNUSEDfrom releasing the stale slots. Those slots remain active in the kernel MT layer until the next touch, at which point they are released in a batch alongside the new contact — causing the userspace event consumer to miss the intervening finger-up sequence and corrupt its gesture session state.
Quoted 1 line
[...]
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git (for-7.3/upstream-fixes), thanks!
[1/1] HID: multitouch: Fix stale MT slots when contact count drops to zero
https://git.kernel.org/hid/hid/c/e8e60b6439ee
Cheers,
Signature · 1 line
Benjamin Tissoires <[email protected]>