FAILED: patch "[PATCH] HID: asus: fix missing hid_is_usb() check" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-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-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 02bf61dfb44f17ec187d1da1a82495951bbd12df
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082550-stinging-mushily-fa27@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 02bf61dfb44f17ec187d1da1a82495951bbd12df Mon Sep 17 00:00:00 2001
From: Jann Horn <[email protected]>
Date: Fri, 3 Jul 2026 17:45:52 +0200
Subject: [PATCH] HID: asus: fix missing hid_is_usb() check
to_usb_interface() can only be used on a hid_device whose parent is really USB; uhid can create devices that identify as being on BUS_USB, but don't actually have a USB parent.
Fix the use of to_usb_interface() without a hid_is_usb() check.
I have verified that it is currently possible to trigger a kernel splat due to this bug in an ASAN build, and that this commit fixes the issue.
drivers/hid/hid-asus.c +1 -1
@@ -950,7 +950,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev)return ret; } -if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { +if ((drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) &&hid_is_usb (hdev)) { intf =to_usb_interface (hdev->dev.parent); udev =interface_to_usbdev (intf); validate_mcu_fw_version(hdev,
Sasha Levin
maintainerPATCH 1/2 HID: asus: simplify RGB init sequence
From: Antheas Kapenekakis <[email protected]>
[ Upstream commit 56d1b33e644cca1bedffbc73d28778ed4ae30f64 ]
Currently, RGB initialization forks depending on whether a device is NKEY. However, in reality both initialization forks are the same, other than the NKEY initialization initializing the LED_REPORT_ID1, LED_REPORT_ID2 endpoints, and the non-NKEY initialization having a functionality check which is skipped for the NKEY path.
Therefore, merge the if blocks, gate the ID1/ID2 initializations behind the NKEY quirk instead, and introduce the functionality check for NKEY devices (it is supported by them).
There should be no functional change with this patch.
Stable-dep-of: 02bf61dfb44f ("HID: asus: fix missing hid_is_usb() check")
--- drivers/hid/hid-asus.c | 52 ++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 30 deletions(-)
drivers/hid/hid-asus.c +22 -30
@@ -638,13 +638,20 @@ static int asus_kbd_register_leds(struct hid_device *hdev)unsigned char kbd_func;int ret; -if (drvdata->quirks &QUIRK_ROG_NKEY_KEYBOARD ) { -/* Initialize keyboard */ - ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID ); -if (ret <0 ) -return ret; + ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID ); +if (ret <0 ) +return ret; -/* The LED endpoint is initialised in two HID */ +/* Get keyboard functions */ + ret =asus_kbd_get_functions (hdev, &kbd_func,FEATURE_KBD_REPORT_ID ); +if (ret <0 ) +return ret; + +/* Check for backlight support */ +if (!(kbd_func &SUPPORT_KBD_BACKLIGHT )) +return -ENODEV ; + +if (drvdata->quirks &QUIRK_ROG_NKEY_KEYBOARD ) { ret =asus_kbd_init (hdev,FEATURE_KBD_LED_REPORT_ID1 );if (ret <0 )return ret;
@@ -652,34 +659,19 @@ static int asus_kbd_register_leds(struct hid_device *hdev) ret =asus_kbd_init (hdev,FEATURE_KBD_LED_REPORT_ID2 );if (ret <0 )return ret; + } -if (dmi_match (DMI_PRODUCT_FAMILY ,"ProArt P16" )) { - ret =asus_kbd_disable_oobe (hdev); -if (ret <0 ) -return ret; - } - -if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { - intf =to_usb_interface (hdev->dev.parent); - udev =interface_to_usbdev (intf); -validate_mcu_fw_version (hdev, -le16_to_cpu (udev->descriptor.idProduct)); - } - - }else { -/* Initialize keyboard */ - ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID ); -if (ret <0 ) -return ret; - -/* Get keyboard functions */ - ret =asus_kbd_get_functions (hdev, &kbd_func,FEATURE_KBD_REPORT_ID ); +if (dmi_match (DMI_PRODUCT_FAMILY ,"ProArt P16" )) { + ret =asus_kbd_disable_oobe (hdev);if (ret <0 )return ret; + } -/* Check for backlight support */ -if (!(kbd_func &SUPPORT_KBD_BACKLIGHT )) -return -ENODEV ; +if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { + intf =to_usb_interface (hdev->dev.parent); + udev =interface_to_usbdev (intf); +validate_mcu_fw_version (hdev, +le16_to_cpu (udev->descriptor.idProduct)); } drvdata->kbd_backlight = devm_kzalloc(&hdev->dev,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 HID: asus: fix missing hid_is_usb() check
From: Jann Horn <[email protected]>
[ Upstream commit 02bf61dfb44f17ec187d1da1a82495951bbd12df ]
to_usb_interface() can only be used on a hid_device whose parent is really USB; uhid can create devices that identify as being on BUS_USB, but don't actually have a USB parent.
Fix the use of to_usb_interface() without a hid_is_usb() check.
I have verified that it is currently possible to trigger a kernel splat due to this bug in an ASAN build, and that this commit fixes the issue.
--- drivers/hid/hid-asus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-asus.c +1 -1
@@ -667,7 +667,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev)return ret; } -if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { +if ((drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) &&hid_is_usb (hdev)) { intf =to_usb_interface (hdev->dev.parent); udev =interface_to_usbdev (intf); validate_mcu_fw_version(hdev,
Signature · 1 line
2.53.0