FAILED: patch "[PATCH] HID: appleir: fix UAF on pending key_up_timer in remove()" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 75fe87e19d8aff81eb2c64d15d244ab8da4de945
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071431-undefined-extenuate-7534@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 75fe87e19d8aff81eb2c64d15d244ab8da4de945 Mon Sep 17 00:00:00 2001
From: Manish Khadka <[email protected]>
Date: Fri, 15 May 2026 23:17:52 +0545
Subject: [PATCH] HID: appleir: fix UAF on pending key_up_timer in remove()
appleir_remove() runs hid_hw_stop() before timer_delete_sync(). hid_hw_stop() synchronously unregisters the HID input device via hid_disconnect() -> hidinput_disconnect() -> input_unregister_device(), which drops the last reference and frees the underlying input_dev when no userspace handle holds it open.
key_up_tick() reads appleir->input_dev and calls input_report_key() / input_sync() on it. The timer is armed from appleir_raw_event() with a HZ/8 (~125 ms) timeout on every keydown and key-repeat report. If a key was pressed shortly before the device is disconnected, the timer can fire after hid_hw_stop() has freed input_dev but before the teardown drains it.
A simple reorder is not sufficient. Putting the timer drain first still leaves a window where a USB URB completion (raw_event) running during hid_hw_stop() can call mod_timer() and re-arm the timer, which then fires after hidinput_disconnect() has freed input_dev. The same URB-completion window also lets raw_event() reach key_up(), key_down() and battery_flat() directly, all of which dereference appleir->input_dev.
Introduce a 'removing' flag on struct appleir, gated by the existing spinlock. appleir_remove() sets the flag under the lock and then shuts down the timer with timer_shutdown_sync(), which both drains any in-flight callback and permanently disables further mod_timer() calls. appleir_raw_event() and key_up_tick() bail out early if the flag is set, so no path can arm or run the timer, or dereference appleir->input_dev, after remove() has started tearing down.
The keyrepeat and flatbattery branches of appleir_raw_event() previously called into the input layer without holding the spinlock; take it now so the flag check is well-defined. This incidentally closes a pre-existing read-side race on appleir->current_key in the keyrepeat branch.
This bug is structurally a sibling of commit 4db2af929279 ("HID:
appletb-kbd: fix UAF in inactivity-timer cleanup path") and has been present since the driver was introduced.
drivers/hid/hid-appleir.c +35 -10
@@ -109,9 +109,10 @@ struct appleir {struct hid_device *hid;unsigned short keymap[ARRAY_SIZE (appleir_key_table)];struct timer_list key_up_timer;/* timer for key up */ -spinlock_t lock;/* protects .current_key */ +spinlock_t lock;/* protects .current_key, .removing */ int current_key;/* the currently pressed key */ int prev_key_idx;/* key index in a 2 packets message */ +bool removing;/* set during teardown; gates input_dev access */ };static int get_key (int data)
@@ -172,7 +173,7 @@ static void key_up_tick(struct timer_list *t)unsigned long flags;spin_lock_irqsave (&appleir->lock, flags); -if (appleir->current_key) { +if (!appleir->removing && appleir->current_key) {key_up (hid, appleir, appleir->current_key); appleir->current_key =0 ; }
@@ -195,6 +196,10 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report,int index;spin_lock_irqsave (&appleir->lock, flags); +if (appleir->removing) { +spin_unlock_irqrestore (&appleir->lock, flags); + goto out; + }/* * If we already have a key down, take it up before marking * this one down
@@ -229,17 +234,25 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report, appleir->prev_key_idx =0 ;if (!memcmp (data, keyrepeat,sizeof (keyrepeat))) { -key_down (hid, appleir, appleir->current_key); -/* -* Remote doesn't do key up, either pull them up, in the test -* above, or here set a timer which pulls them up after 1/8 s -*/ -mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) { +key_down (hid, appleir, appleir->current_key); +/* +* Remote doesn't do key up, either pull them up, in +* the test above, or here set a timer which pulls them +* up after 1/8 s +*/ +mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); + } +spin_unlock_irqrestore (&appleir->lock, flags); goto out; }if (!memcmp (data, flatbattery,sizeof (flatbattery))) { -battery_flat (appleir); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) +battery_flat (appleir); +spin_unlock_irqrestore (&appleir->lock, flags);/* Fall through */ }
@@ -318,8 +331,20 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)static void appleir_remove (struct hid_device *hid) {struct appleir *appleir =hid_get_drvdata (hid); +unsigned long flags; + +/* +* Mark the driver as tearing down so that any concurrent raw_event +* (e.g. from a USB URB completion that hid_hw_stop() has not yet +* killed) and the key_up_timer softirq stop touching input_dev +* before hid_hw_stop() frees it via hidinput_disconnect(). +*/ +spin_lock_irqsave (&appleir->lock, flags); + appleir->removing = true; +spin_unlock_irqrestore (&appleir->lock, flags); + +timer_shutdown_sync (&appleir->key_up_timer);hid_hw_stop (hid); -timer_delete_sync (&appleir->key_up_timer); }static const struct hid_device_id appleir_devices[] = {
Sasha Levin
maintainerPATCH 1/1 HID: appleir: fix UAF on pending key_up_timer in remove()
From: Manish Khadka <[email protected]>
[ Upstream commit 75fe87e19d8aff81eb2c64d15d244ab8da4de945 ]
appleir_remove() runs hid_hw_stop() before timer_delete_sync(). hid_hw_stop() synchronously unregisters the HID input device via hid_disconnect() -> hidinput_disconnect() -> input_unregister_device(), which drops the last reference and frees the underlying input_dev when no userspace handle holds it open.
key_up_tick() reads appleir->input_dev and calls input_report_key() / input_sync() on it. The timer is armed from appleir_raw_event() with a HZ/8 (~125 ms) timeout on every keydown and key-repeat report. If a key was pressed shortly before the device is disconnected, the timer can fire after hid_hw_stop() has freed input_dev but before the teardown drains it.
A simple reorder is not sufficient. Putting the timer drain first still leaves a window where a USB URB completion (raw_event) running during hid_hw_stop() can call mod_timer() and re-arm the timer, which then fires after hidinput_disconnect() has freed input_dev. The same URB-completion window also lets raw_event() reach key_up(), key_down() and battery_flat() directly, all of which dereference appleir->input_dev.
Introduce a 'removing' flag on struct appleir, gated by the existing spinlock. appleir_remove() sets the flag under the lock and then shuts down the timer with timer_shutdown_sync(), which both drains any in-flight callback and permanently disables further mod_timer() calls. appleir_raw_event() and key_up_tick() bail out early if the flag is set, so no path can arm or run the timer, or dereference appleir->input_dev, after remove() has started tearing down.
The keyrepeat and flatbattery branches of appleir_raw_event() previously called into the input layer without holding the spinlock; take it now so the flag check is well-defined. This incidentally closes a pre-existing read-side race on appleir->current_key in the keyrepeat branch.
This bug is structurally a sibling of commit 4db2af929279 ("HID:
appletb-kbd: fix UAF in inactivity-timer cleanup path") and has been present since the driver was introduced.
--- drivers/hid/hid-appleir.c | 45 ++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-)
drivers/hid/hid-appleir.c +35 -10
@@ -109,9 +109,10 @@ struct appleir {struct hid_device *hid;unsigned short keymap[ARRAY_SIZE (appleir_key_table)];struct timer_list key_up_timer;/* timer for key up */ -spinlock_t lock;/* protects .current_key */ +spinlock_t lock;/* protects .current_key, .removing */ int current_key;/* the currently pressed key */ int prev_key_idx;/* key index in a 2 packets message */ +bool removing;/* set during teardown; gates input_dev access */ };static int get_key (int data)
@@ -172,7 +173,7 @@ static void key_up_tick(struct timer_list *t)unsigned long flags;spin_lock_irqsave (&appleir->lock, flags); -if (appleir->current_key) { +if (!appleir->removing && appleir->current_key) {key_up (hid, appleir, appleir->current_key); appleir->current_key =0 ; }
@@ -195,6 +196,10 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report,int index;spin_lock_irqsave (&appleir->lock, flags); +if (appleir->removing) { +spin_unlock_irqrestore (&appleir->lock, flags); + goto out; + }/* * If we already have a key down, take it up before marking * this one down
@@ -229,17 +234,25 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report, appleir->prev_key_idx =0 ;if (!memcmp (data, keyrepeat,sizeof (keyrepeat))) { -key_down (hid, appleir, appleir->current_key); -/* -* Remote doesn't do key up, either pull them up, in the test -* above, or here set a timer which pulls them up after 1/8 s -*/ -mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) { +key_down (hid, appleir, appleir->current_key); +/* +* Remote doesn't do key up, either pull them up, in +* the test above, or here set a timer which pulls them +* up after 1/8 s +*/ +mod_timer (&appleir->key_up_timer, jiffies +HZ /8 ); + } +spin_unlock_irqrestore (&appleir->lock, flags); goto out; }if (!memcmp (data, flatbattery,sizeof (flatbattery))) { -battery_flat (appleir); +spin_lock_irqsave (&appleir->lock, flags); +if (!appleir->removing) +battery_flat (appleir); +spin_unlock_irqrestore (&appleir->lock, flags);/* Fall through */ }
@@ -318,8 +331,20 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)static void appleir_remove (struct hid_device *hid) {struct appleir *appleir =hid_get_drvdata (hid); +unsigned long flags; + +/* +* Mark the driver as tearing down so that any concurrent raw_event +* (e.g. from a USB URB completion that hid_hw_stop() has not yet +* killed) and the key_up_timer softirq stop touching input_dev +* before hid_hw_stop() frees it via hidinput_disconnect(). +*/ +spin_lock_irqsave (&appleir->lock, flags); + appleir->removing = true; +spin_unlock_irqrestore (&appleir->lock, flags); + +timer_delete_sync (&appleir->key_up_timer);hid_hw_stop (hid); -del_timer_sync (&appleir->key_up_timer); }static const struct hid_device_id appleir_devices[] = {
Signature · 1 line
2.53.0