[PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[Tristan Madani]

From: Tristan Madani <tristan@talencesecurity.com>

oxp_hid_remove() uses cancel_delayed_work() for all three delayed work
items.  cancel_delayed_work() only dequeues a pending work item without
waiting for a currently executing callback to finish.  If any of the
work callbacks (oxp_rgb_queue_fn, oxp_btn_queue_fn, oxp_mcu_init_fn) is
running at the time of removal, the callback continues executing
concurrently with hid_hw_close() and hid_hw_stop(), accessing the HID
device after it has been closed and stopped.

Use cancel_delayed_work_sync() instead to ensure that any in-progress
work callback completes before device teardown proceeds.

Fixes: 84910c459d65 ("HID: hid-oxp: Add OneXPlayer configuration driver")
Cc: stable@vger.kernel.org
Signed-off-by: Tristan Madani <tristan@talencesecurity.com>
---
 drivers/hid/hid-oxp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c
index d2ded6b08ce9e..1e691ebc1199e 100644
--- a/drivers/hid/hid-oxp.c
+++ b/drivers/hid/hid-oxp.c
@@ -1552,9 +1552,9 @@ static int oxp_hid_probe(struct hid_device *hdev,
 
 static void oxp_hid_remove(struct hid_device *hdev)
 {
-	cancel_delayed_work(&drvdata.oxp_rgb_queue);
-	cancel_delayed_work(&drvdata.oxp_btn_queue);
-	cancel_delayed_work(&drvdata.oxp_mcu_init);
+	cancel_delayed_work_sync(&drvdata.oxp_rgb_queue);
+	cancel_delayed_work_sync(&drvdata.oxp_btn_queue);
+	cancel_delayed_work_sync(&drvdata.oxp_mcu_init);
 	hid_hw_close(hdev);
 	hid_hw_stop(hdev);
 }
-- 
2.47.3

Re: [PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider:

New issues:
- [High] The patch replaces `cancel_delayed_work()` with `cancel_delayed_work_sync()`, which triggers a kernel warning dump when unbinding devices with unhandled usage pages.

Pre-existing issues:
- [High] The `probe()` error path fails to cancel scheduled delayed work items, leading to a Use-After-Free when they execute after device cleanup.
- [High] Improper teardown order in `remove()` allows cancelled delayed works to be immediately re-armed by active hardware or devm-managed interfaces, causing Use-After-Free.
- [High] The driver stores per-device private data in a single static global struct, preventing support for multiple devices and causing cross-device memory corruption.
- [High] Raw event handlers unconditionally dereference `led_mc`, which can be NULL due to early events or being explicitly bypassed for hybrid MCU devices.
- [High] Raw event handlers blindly access report data without validating the payload size, leading to out-of-bounds reads.
--

commit 950755ef4b37410fb2c6c0a59c421a32eadb69c4
Author: Tristan Madani <tristan@talencesecurity.com>

HID: hid-oxp: use cancel_delayed_work_sync() in remove
    
oxp_hid_remove() uses cancel_delayed_work() for all three delayed work
items.  cancel_delayed_work() only dequeues a pending work item without
waiting for a currently executing callback to finish.  If any of the
work callbacks (oxp_rgb_queue_fn, oxp_btn_queue_fn, oxp_mcu_init_fn) is
running at the time of removal, the callback continues executing
concurrently with hid_hw_close() and hid_hw_stop(), accessing the HID
device after it has been closed and stopped.
    
Use cancel_delayed_work_sync() instead to ensure that any in-progress
work callback completes before device teardown proceeds.

> diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c
> index d2ded6b08ce9e..1e691ebc1199e 100644
> --- a/drivers/hid/hid-oxp.c
> +++ b/drivers/hid/hid-oxp.c
> @@ -1552,9 +1552,9 @@ static int oxp_hid_probe(struct hid_device *hdev,
>  
>  static void oxp_hid_remove(struct hid_device *hdev)
>  {
> -	cancel_delayed_work(&drvdata.oxp_rgb_queue);
> -	cancel_delayed_work(&drvdata.oxp_btn_queue);
> -	cancel_delayed_work(&drvdata.oxp_mcu_init);
> +	cancel_delayed_work_sync(&drvdata.oxp_rgb_queue);
> +	cancel_delayed_work_sync(&drvdata.oxp_btn_queue);
> +	cancel_delayed_work_sync(&drvdata.oxp_mcu_init);

[Severity: High]
Will this trigger a warning if oxp_hid_probe() returns early without
initializing these work items?

If oxp_hid_probe() encounters an unknown usage page, it returns 0 without
calling oxp_cfg_probe():

drivers/hid/hid-oxp.c:oxp_hid_probe() {
    ...
    default:
        return 0;
    }
}

This leaves the global drvdata structure zero-filled and the delayed works
uninitialized. When the device is unbound, oxp_hid_remove() unconditionally
calls cancel_delayed_work_sync() on these uninitialized items. 

Since __flush_work() triggers WARN_ON(!work->func) for zero-filled work items,
could this cause kernel warning dumps during device removal?

[Severity: High]
This is a pre-existing issue, but does cancelling the work items before
stopping the hardware allow them to be re-armed?

Because the work items are cancelled before calling hid_hw_stop() and
before devm-managed sysfs interfaces are torn down, active hardware can
send a report to oxp_hid_raw_event_gen_2() and re-queue oxp_mcu_init.

Similarly, userspace can write to the map_button_store sysfs attribute
and re-arm oxp_btn_queue:

drivers/hid/hid-oxp.c:map_button_store() {
    ...
    mod_delayed_work(system_dfl_wq, &drvdata.oxp_btn_queue,
                     msecs_to_jiffies(50));
}

Since devres will free the backing memory after oxp_hid_remove() returns,
if a work item is re-armed during this window, could it execute after the
memory is freed and cause a use-after-free?

>  	hid_hw_close(hdev);
>  	hid_hw_stop(hdev);
>  }

[Severity: High]
This isn't a bug introduced by this patch, but does the oxp_hid_probe()
error path leak scheduled workers?

During initialization in oxp_cfg_probe(), the delayed work is armed:

drivers/hid/hid-oxp.c:oxp_cfg_probe() {
    ...
    mod_delayed_work(system_dfl_wq, &drvdata.oxp_mcu_init,
                     msecs_to_jiffies(50));
    ...
}

If a failure occurs, the error path in oxp_hid_probe() stops the hardware
but does not cancel the work items:

drivers/hid/hid-oxp.c:oxp_hid_probe() {
    ...
    ret = oxp_cfg_probe(hdev, up);
    if (ret) {
        hid_hw_close(hdev);
        hid_hw_stop(hdev);
    }
    ...
}

When probe() returns the error, devres releases memory like drvdata.bmap_1.
When the delayed work executes later, will it access the freed devres
memory and cause a use-after-free?

[Severity: High]
This isn't a bug introduced by this patch, but does using a single static
global structure for driver data break support for multiple devices?

The driver stores state globally instead of allocating it per-device:

drivers/hid/hid-oxp.c:
static struct oxp_hid_cfg {
    struct delayed_work oxp_rgb_queue;
    ...
} drvdata;

Since oxp_cfg_probe() writes device-specific pointers like hdev directly to
this global structure, if multiple supported devices are connected, will
they overwrite each other's state? 

Furthermore, if one device is removed, will its cleanup cancel the workqueues
and destroy the global state used by other active devices?

[Severity: High]
This is a pre-existing issue, but can led_mc be unconditionally dereferenced
in raw event handlers before it is initialized?

In oxp_hid_probe(), the hardware is started via hid_hw_start() before
oxp_cfg_probe() initializes drvdata.led_mc. Additionally, if the device is a
hybrid MCU, initialization is explicitly bypassed:

drivers/hid/hid-oxp.c:oxp_cfg_probe() {
    ...
    if (up == GEN2_USAGE_PAGE && oxp_hybrid_mcu_device())
        goto skip_rgb;
    ...
}

If an early event arrives, or if a hybrid MCU device sends a status event,
oxp_hid_raw_event_gen_2() accesses the pointer directly:

drivers/hid/hid-oxp.c:oxp_hid_raw_event_gen_2() {
    ...
    led_mc->led_cdev.brightness = rgb_rep->brightness / 4 *
                                  led_mc->led_cdev.max_brightness;
    ...
}

Will this lead to a NULL pointer dereference?

[Severity: High]
This is a pre-existing issue, but do the raw event handlers blindly access
report data without validating the size?

The raw event handler receives a data buffer and its size, but uses a
hardcoded length for debug printing:

drivers/hid/hid-oxp.c:oxp_hid_raw_event() {
    ...
    dev_dbg(&hdev->dev, "raw event data: [%*ph]\n", OXP_PACKET_SIZE, data);
    ...
}

Then, oxp_hid_raw_event_gen_2() accesses array indices without verifying
the incoming size:

drivers/hid/hid-oxp.c:oxp_hid_raw_event_gen_2() {
    ...
    if (data[3] == OXP_EFFECT_MONO_TRUE) {
    ...
}

If a malicious or malfunctioning device sends a short report, will this
cause an out-of-bounds read?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260904105800.3923987-1-tristmd@gmail.com?part=1

Re: [PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[Derek J. Clark]

On September 4, 2026 3:58:00 AM PDT, Tristan Madani <tristmd@gmail.com> wrote:
>From: Tristan Madani <tristan@talencesecurity.com>
>
>oxp_hid_remove() uses cancel_delayed_work() for all three delayed work
>items.  cancel_delayed_work() only dequeues a pending work item without
>waiting for a currently executing callback to finish.  If any of the
>work callbacks (oxp_rgb_queue_fn, oxp_btn_queue_fn, oxp_mcu_init_fn) is
>running at the time of removal, the callback continues executing
>concurrently with hid_hw_close() and hid_hw_stop(), accessing the HID
>device after it has been closed and stopped.
>
>Use cancel_delayed_work_sync() instead to ensure that any in-progress
>work callback completes before device teardown proceeds.
>
>Fixes: 84910c459d65 ("HID: hid-oxp: Add OneXPlayer configuration driver")
>Cc: stable@vger.kernel.org
>Signed-off-by: Tristan Madani <tristan@talencesecurity.com>


Hi Tristan,

LGTM, thanks.

Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>
>---
> drivers/hid/hid-oxp.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c
>index d2ded6b08ce9e..1e691ebc1199e 100644
>--- a/drivers/hid/hid-oxp.c
>+++ b/drivers/hid/hid-oxp.c
>@@ -1552,9 +1552,9 @@ static int oxp_hid_probe(struct hid_device *hdev,
> 
> static void oxp_hid_remove(struct hid_device *hdev)
> {
>-	cancel_delayed_work(&drvdata.oxp_rgb_queue);
>-	cancel_delayed_work(&drvdata.oxp_btn_queue);
>-	cancel_delayed_work(&drvdata.oxp_mcu_init);
>+	cancel_delayed_work_sync(&drvdata.oxp_rgb_queue);
>+	cancel_delayed_work_sync(&drvdata.oxp_btn_queue);
>+	cancel_delayed_work_sync(&drvdata.oxp_mcu_init);
> 	hid_hw_close(hdev);
> 	hid_hw_stop(hdev);
> }

Re: [PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[Tristan Madani]

Hi Derek,

Thanks for the review.

One thing the Sashiko bot flagged, and I think it's valid: if
oxp_hid_probe() returns early on an unknown usage page (the
default: return 0 path), the delayed work items are never
initialized via INIT_DELAYED_WORK().  In that case,
cancel_delayed_work_sync() in remove() would call __flush_work()
on a zero-filled work struct, which hits WARN_ON(!work->func).

The non-sync cancel_delayed_work() didn't trigger this because it
never calls __flush_work().

Do you think this path is actually reachable in practice, or are
the usage page IDs exhaustive for all matched devices?  If it can
happen, I can send a v2 that guards the cancels.

Thanks,
Tristan

Re: [PATCH] HID: hid-oxp: use cancel_delayed_work_sync() in remove

[Derek J. Clark]

On September 4, 2026 2:17:02 PM PDT, Tristan Madani <tristmd@gmail.com> wrote:
>Hi Derek,
>
>Thanks for the review.
>
>One thing the Sashiko bot flagged, and I think it's valid: if
>oxp_hid_probe() returns early on an unknown usage page (the
>default: return 0 path), the delayed work items are never
>initialized via INIT_DELAYED_WORK().  In that case,
>cancel_delayed_work_sync() in remove() would call __flush_work()
>on a zero-filled work struct, which hits WARN_ON(!work->func).
>
>The non-sync cancel_delayed_work() didn't trigger this because it
>never calls __flush_work().
>
>Do you think this path is actually reachable in practice, or are
>the usage page IDs exhaustive for all matched devices?  If it can
>happen, I can send a v2 that guards the cancels.
>
If the usage page rejects init then I think we can safely assume that it will be an effective gate.

There's a series in the works ATM that will make drvdata unique per hid dev after the usage page checka, so we could also wait for that and if it's not fixed by that series then gate on drvdata not being NULL.

Cheers,
Derek

>Thanks,
>Tristan