From nobody Sat Jun 13 23:41:30 2026 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFC6C368282 for ; Sat, 13 Jun 2026 15:30:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364645; cv=none; b=fzpqpJV3Pzg1doe72aOziKZt/jNPJuyOoTQRExNWWwdDsUO3AzaInAlWYqRQdC1EYCH2+2OFtviMQPbkVQccGel0D0Ots3Z4usp4wT+hA5kSdpjIj5ShBocvHAZEJNp9vZR/LJPAMajxDcRtCsfzqhjC9o+z0t18x8GWpTKSQdE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364645; c=relaxed/simple; bh=VusbUj8p+T+MFMkvMCqRDytDwrMT7MDJ2YBcoYaEGgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JnpeAGeu/PeOe5731TSwIhcy2XyXCBucet3tduwY1kQerdqgFAreNfONOG7O4mRq36yYX2rJZ3IHxWUAxiRBNYiQYpDeJ8p+OzP9G2aaq475FPlThu/loCtLkc4hcySvv0/GcS8f7oTl3PQOzCLfAavPUk6tkS2d2TNI50DaVpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=hQ1kKL4+; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="hQ1kKL4+" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UFD1GicoxE0fLhqpGTRi6m4boj42UehFQ0rfHVzbp5E=; b=hQ1kKL4+O90yqOOv6WPu8JEdzPIQvCRVf8bIPH8FABO0QWlff8XjTU8B/ppeqS3K8z6Z2K KaOZblyPi+WDRFV8OSC+BPV+1pgEQ7TH/7EftH3qdrkMu39/P8u3XnOB57BcwddITQBcm8 9KiCSrWmRT9mmoR/V91eSRXjMt36E6I= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" , sashiko-bot@kernel.org Subject: [PATCH v3 1/8] HID: asus: mitigate possible use-after-free Date: Sat, 13 Jun 2026 15:30:22 +0000 Message-ID: <20260613153029.2559774-2-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The kbd_backlight pointer is not being set to NULL after being freed in asus_kbd_register_leds and other portions of the driver checks that field, therefore set the pointer to NULL after being freed. Link: https://lore.kernel.org/all/20260612130125.AAAE71F000E9@smtp.kernel.o= rg/ Suggested-by: sashiko-bot@kernel.org Reviewed-by: Antheas Kapenekakis Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index d34d74df3dc0..4d7110b892bd 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -777,6 +777,7 @@ static int asus_kbd_register_leds(struct hid_device *hd= ev) if (ret < 0) { /* No need to have this still around */ devm_kfree(&hdev->dev, drvdata->kbd_backlight); + drvdata->kbd_backlight =3D NULL; } =20 return ret; --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC41B37EFF8 for ; Sat, 13 Jun 2026 15:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364646; cv=none; b=XsGxj1seua2tN6triGZ5+dzNJHxAb2HIscaCwL83Zc5m0C1NGTgpPS/+XGaaHMtBCkFP1Sdi6fAWTJV6ZjLDAqBNnj7ofL7vnZB3KpJbYmp8DQ4GY+p4dTKDRFbNMhjxhWWhOInkxqiPZvvr9bf3pueSK7JMBGqJWBvkLqk/UJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364646; c=relaxed/simple; bh=sUnXM1OWVjMiDZeUu56Ec1S5vGLpq97dioVKbPR7OBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QFdtgvyGabb3+0FF47FfxtOVZvUm3H9A0Xr+3kdp8zSlleToMS46MuVnsfov/XKKi4ugY3klZZJyI1QF8evZZKaiF4ogF/RYpdl5R9/cxmXZ7iPkkdH8CuZFDAOa1wBBMI8XDyzF3VARv8/WmBOsJ2Cizy+9XutlL7dHn9QEmiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=XHY/pHxr; arc=none smtp.client-ip=91.218.175.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="XHY/pHxr" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0gCNjc6f2KrHDHK++JxynXo6mhqWfC/Nh8DPkONGza0=; b=XHY/pHxr0QySCjTlb0TJUYTV94Dn19nEm6InL6XwCxwrKFDl5rbyNlUBpjlFCbJqgxZqwA TQtoIqcYaly5GSvYLPvGcQB8TSYuSYMc6ZN8XDCAGqcHA/T7YFPVafU9lnljqw9ztVd+vh KrM8f0NCecB1eBJzVN1AARjyrYuwL3E= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" , sashiko-bot@kernel.org Subject: [PATCH v3 2/8] HID: asus: prevent wrong pointer cast Date: Sat, 13 Jun 2026 15:30:23 +0000 Message-ID: <20260613153029.2559774-3-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The firmware version check for ROG ally devices assumes the parent device is a USB device, therefore prevent possible out-of-bounds access by using hid_is_usb() to mitigate possible out-of-bounds access. Link: https://lore.kernel.org/all/20260612130125.AAAE71F000E9@smtp.kernel.o= rg/ Fixes: 00e005c952f7 ("hid-asus: check ROG Ally MCU version and warn") Suggested-by: sashiko-bot@kernel.org Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 4d7110b892bd..323dc0b7f3ff 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -753,7 +753,7 @@ static int asus_kbd_register_leds(struct hid_device *hd= ev) return ret; } =20 - if (drvdata->quirks & QUIRK_ROG_ALLY_XPAD) { + if (hid_is_usb(hdev) && (drvdata->quirks & QUIRK_ROG_ALLY_XPAD)) { intf =3D to_usb_interface(hdev->dev.parent); udev =3D interface_to_usbdev(intf); validate_mcu_fw_version(hdev, --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C539E38B149 for ; Sat, 13 Jun 2026 15:30:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364647; cv=none; b=ixLBoYbs0ZoG/7NofxkZ9kRiXg22a4vJv3xQdc4Dga8Imua1eSefvV6fGa9EzNAiPsE2lrvRJuXWPDbkqcMaxDZDfwn7cKlIXUA88EnuzGQdhjUhcziAlDdzxoa3Rt677O5FKnwKokLD/utPgsPshB8NeCG5QetOyeDXcfpL9OA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364647; c=relaxed/simple; bh=A9OPBayvSKJ+jp6Eaq/xjIYdRxdiXKxCYB8wFAm2fd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XqqAQ0HxOVawnjhaL9VVA3BHVyP6lgsoOxZHwMs6xW8kAp9n/kImbEON/8EzwtgS02LvlKdP79XeXp0eEBMDPwbccppL1So0AZBUZ2vZF6aW5mF+wGABHeV+Pt9O5WMEwiFxC02s3E902t1Z0lDaYKb7dYPKNBbBXE1tmV00KB0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Nw1Y4Iiv; arc=none smtp.client-ip=91.218.175.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Nw1Y4Iiv" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7h5w3+qH/FO4M18bupJw7+SJTaTNAr4SBWoNeLiG3Og=; b=Nw1Y4IivoPWJVvlqg5hPFGCtpp21JAAsvuQjcEe31R49aTkiWPFelFvdArkZrh+mhzuxXF ARzrUIf7cGL45Qx5ZvzqMN7HQwD+jycUBMFlaLI7k57WNVhAOtU5xJdNXZy2xOlI88KCYT vUBW/GWtIRbY1ML71Ai26Qy+TIJHcO8= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" Subject: [PATCH v3 3/8] HID: asus: add support for xgm led Date: Sat, 13 Jun 2026 15:30:24 +0000 Message-ID: <20260613153029.2559774-4-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" XG mobile stations have very bright leds behind the fan that can be turned either ON or OFF: add a cled interface to allow controlling the brightness of those red leds. Reviewed by: Antheas Kapenekakis Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 323dc0b7f3ff..0a6c97155549 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -51,6 +51,8 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define FEATURE_KBD_LED_REPORT_ID1 0x5d #define FEATURE_KBD_LED_REPORT_ID2 0x5e =20 +#define ROG_XGM_REPORT_SIZE 300 + #define ROG_ALLY_REPORT_SIZE 64 #define ROG_ALLY_X_MIN_MCU 313 #define ROG_ALLY_MIN_MCU 319 @@ -118,6 +120,11 @@ struct asus_kbd_leds { bool removed; }; =20 +struct asus_xgm_led { + struct led_classdev cdev; + struct hid_device *hdev; +}; + struct asus_touchpad_info { int max_x; int max_y; @@ -143,6 +150,7 @@ struct asus_drvdata { unsigned long battery_next_query; struct work_struct fn_lock_sync_work; bool fn_lock; + struct asus_xgm_led *xgm_led; }; =20 static int asus_report_battery(struct asus_drvdata *, u8 *, int); @@ -941,6 +949,23 @@ static int asus_battery_probe(struct hid_device *hdev) return ret; } =20 +static int asus_xgm_led_set(struct led_classdev *led_cdev, enum led_bright= ness value) +{ + const u8 buf[ROG_XGM_REPORT_SIZE] =3D { + FEATURE_KBD_LED_REPORT_ID2, 0xC5, (value) ? 0x50 : 0x00 + }; + struct asus_xgm_led *xgm =3D container_of(led_cdev, struct asus_xgm_led, = cdev); + int ret; + + ret =3D asus_kbd_set_report(xgm->hdev, buf, ROG_XGM_REPORT_SIZE); + if (ret !=3D ROG_XGM_REPORT_SIZE) { + hid_err(xgm->hdev, "Unable to set XG mobile led state: %d\n", ret); + return ret; + } + + return 0; +} + static int asus_input_configured(struct hid_device *hdev, struct hid_input= *hi) { struct input_dev *input =3D hi->input; @@ -1169,6 +1194,51 @@ static int asus_start_multitouch(struct hid_device *= hdev) return 0; } =20 +static int asus_xgm_init(struct hid_device *hdev, struct asus_drvdata *drv= data) +{ + const char *name; + int ret; + + drvdata->xgm_led =3D devm_kzalloc(&hdev->dev, sizeof(*drvdata->xgm_led), = GFP_KERNEL); + if (drvdata->xgm_led =3D=3D NULL) + return -ENOMEM; + + name =3D devm_kasprintf(&hdev->dev, GFP_KERNEL, "asus:xgm-%s:led", + strlen(hdev->uniq) ? hdev->uniq : dev_name(&hdev->dev)); + + if (name =3D=3D NULL) { + ret =3D -ENOMEM; + goto asus_xgm_init_err; + } + + drvdata->xgm_led->hdev =3D hdev; + drvdata->xgm_led->cdev.name =3D name; + drvdata->xgm_led->cdev.brightness =3D 1; + drvdata->xgm_led->cdev.max_brightness =3D 1; + drvdata->xgm_led->cdev.brightness_set_blocking =3D asus_xgm_led_set; + + /* LED state is arbitrary on boot, set a default */ + ret =3D asus_xgm_led_set(&drvdata->xgm_led->cdev, drvdata->xgm_led->cdev.= brightness); + if (ret) { + hid_err(hdev, "Asus failed to set xgm led: %d\n", ret); + goto asus_xgm_init_led_err; + } + + ret =3D led_classdev_register(&hdev->dev, &drvdata->xgm_led->cdev); + if (ret) { + hid_err(hdev, "Asus failed to register xgm led: %d\n", ret); + goto asus_xgm_init_led_err; + } + + return 0; +asus_xgm_init_led_err: + devm_kfree(&hdev->dev, name); +asus_xgm_init_err: + devm_kfree(&hdev->dev, drvdata->xgm_led); + drvdata->xgm_led =3D NULL; + return ret; +} + static int __maybe_unused asus_resume(struct hid_device *hdev) { struct asus_drvdata *drvdata =3D hid_get_drvdata(hdev); @@ -1184,6 +1254,14 @@ static int __maybe_unused asus_resume(struct hid_dev= ice *hdev) } } =20 + if (drvdata->xgm_led) { + ret =3D asus_xgm_led_set(&drvdata->xgm_led->cdev, drvdata->xgm_led->cdev= .brightness); + if (ret) { + hid_err(hdev, "Asus failed to restore xgm brightness: %d\n", ret); + goto asus_resume_err; + } + } + asus_resume_err: return ret; } @@ -1310,6 +1388,16 @@ static int asus_probe(struct hid_device *hdev, const= struct hid_device_id *id) } } =20 + if (asus_has_report_id(hdev, FEATURE_KBD_REPORT_ID) && + ((hdev->product =3D=3D USB_DEVICE_ID_ASUSTEK_XGM_2022) || + (hdev->product =3D=3D USB_DEVICE_ID_ASUSTEK_XGM_2023))) { + ret =3D asus_xgm_init(hdev, drvdata); + if (ret) { + hid_err(hdev, "Failed to initialize xg mobile: %d\n", ret); + goto err_stop_hw; + } + } + /* Laptops keyboard backlight is always at 0x5a */ if (is_vendor && (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) && (asus_has_report_id(hdev, FEATURE_KBD_REPORT_ID)) && @@ -1366,6 +1454,9 @@ static void asus_remove(struct hid_device *hdev) if (drvdata->quirks & QUIRK_HID_FN_LOCK) cancel_work_sync(&drvdata->fn_lock_sync_work); =20 + if (drvdata->xgm_led) + led_classdev_unregister(&drvdata->xgm_led->cdev); + hid_hw_stop(hdev); } =20 --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3F8138B15B for ; Sat, 13 Jun 2026 15:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364648; cv=none; b=cEi8+onZnDRxJfLoh5vtsv3eXFr3Yu9SmOKxSuOryimKxnaaLYsXEpUpnFu83cW40r4zaqmqzcePpB4DnAbtsTBYXLcrnBJ2uAxErwZQQCJjtCuffrI9n7C0OsZB24HWTFxtOqbxabFJvsAZ37bGAgvaF0A8JI+hkzf6tWxdRG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364648; c=relaxed/simple; bh=94YcZ6ZNYmxuTKDWrd+gjT+yz9DM+SHIJ1aRQXaE8T0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eXT3sNc7NE797CTo3/EJqnptE3N/wqc+/rS60NcBzlHoLnqW7cErlu5UZ9FxTEju5jsl0xQ5/Os2ib/831pAPQhA3/3egut6gNWIAdrTXxWMDo9CFqNdWX4TZsUGvOwYsLF7jMgwRPynMQH+epzTGnrv2J5xLyLRBAWBY/ahtDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=hZM9iriy; arc=none smtp.client-ip=91.218.175.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="hZM9iriy" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CbW640+mmnY2NwwdExxOb7zmHslMNCB8Z3rzlSkO0Co=; b=hZM9iriyQm6Nu1wLxr3Bt4n7ceJ6Z4iFtbeySAP8OXilZo5MxRMfASkFlewSiT7RNlUy1c 924rJKBL81JhGTbt8/82GA+7dkFBYlNPERD7Fbjgzlhao/3OStWZiRspIUzGoKX7SzJ3ir WI6eAsdf1vE7SfF4rWiFJwnhqKQzz38= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" , sahiko-bot@kernel.org Subject: [PATCH v3 4/8] HID: asus: cleanup keyboard listener on failure: avoid use-after-free Date: Sat, 13 Jun 2026 15:30:25 +0000 Message-ID: <20260613153029.2559774-5-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" asus_kbd_register_leds(), I noticed it registers a listener to a global list and uses devm_kzalloc(). If a subsequent initialization step in asus_probe() fails the driver returns without unregistering the listener, and the devres subsystem will automatically free the memory, leaving a dangling pointer in the global list. Fixes: b34b5945a769 ("HID: asus: listen to the asus-wmi brightness device i= nstead of creating one") Reported-by: sahiko-bot@kernel.org Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 0a6c97155549..f38b18ad65c6 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1426,11 +1426,17 @@ static int asus_probe(struct hid_device *hdev, cons= t struct hid_device_id *id) if (drvdata->tp) { ret =3D asus_start_multitouch(hdev); if (ret) - goto err_stop_hw; + goto err_unregister_backlight; } } =20 return 0; +err_unregister_backlight: + if (drvdata->kbd_backlight) { + asus_hid_unregister_listener(&drvdata->kbd_backlight->listener); + devm_kfree(&hdev->dev, drvdata->kbd_backlight); + drvdata->kbd_backlight =3D NULL; + } err_stop_hw: hid_hw_stop(hdev); return ret; --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 277A3381B05 for ; Sat, 13 Jun 2026 15:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364650; cv=none; b=iUHZkK0m/BaeapE7LxgIfgZMKcEdlRcmdjsRWJjLNSKmcUplicAmOM4KsWy43Ao9WkIiOAvC784bg5+LwcsewQtDRPRXs8LC+4NelVDOP4zWfEdxRR37pXj5+TG1lWjP4NnVA3uh3BX+v5i0B7Y1mgIaB1J51ok8FEr7klNoY9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364650; c=relaxed/simple; bh=/NkXRBdpBcvCQDy0NVB1p+IEdH3M8AYrYBio8yu7EFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMqXkch1Le9uWjZEyReZtHySD6mSBuKSWA4esTzayWpg2ikWGvIIpMyEshq6XtBK2f1wJVU0GDCb3L46+cwB4Vp5mIrcgboMgn3FbvFTs6eVuTfoBJ5XVSkwrVReB+MQzL2WsoFt84oCTvbpriKSAcsWLketnCexUOkwi/eFCTI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=DTsFOVOY; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="DTsFOVOY" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=neHECkpkrl0f2eL1rmrqpo8oK4ZifRZpF3yJLogXsSs=; b=DTsFOVOYlFt47fsRnqmMYYTPb5BPgctaJhFpPsKYnPmqzHrC2YsrbIm+oHsjGtS8yWG+qi Vbp035iozZHkSgSs9N9pqCbuGQyDY3WqJ82Cs3dtlzyE899fMsAJDfykWBkPrIg2psWLSb ReeaV9hdAhEYKVlw5jKBK5pBYiGKKnI= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" , sahiko-bot@kernel.org Subject: [PATCH v3 5/8] HID: asus: avoid sleeping calls in atomic context Date: Sat, 13 Jun 2026 15:30:26 +0000 Message-ID: <20260613153029.2559774-6-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Avoid possibly calling asus_wmi_send_event(): a method that can sleep in asus_raw_event() that is called in atomic context. This commit changes when methods are called, not method parameters: the driver behaves as before. Fixes: 1489a34e97ef ("HID: asus: Implement Fn+F5 fan control key handler") Reported-by: sahiko-bot@kernel.org Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 67 +++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index f38b18ad65c6..a6467172c455 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -150,6 +150,13 @@ struct asus_drvdata { unsigned long battery_next_query; struct work_struct fn_lock_sync_work; bool fn_lock; +#if IS_REACHABLE(CONFIG_ASUS_WMI) + struct work_struct wmi_work; + bool wmi_work_disabled; + u8 wmi_data[FEATURE_KBD_REPORT_SIZE]; + int wmi_size; + spinlock_t wmi_lock; +#endif struct asus_xgm_led *xgm_led; }; =20 @@ -338,6 +345,7 @@ static int asus_e1239t_event(struct asus_drvdata *drvda= t, u8 *data, int size) return 0; } =20 +#if IS_REACHABLE(CONFIG_ASUS_WMI) /* * Send events to asus-wmi driver for handling special keys */ @@ -361,6 +369,32 @@ static int asus_wmi_send_event(struct asus_drvdata *dr= vdata, u8 code) return 0; } =20 +static void asus_wmi_work(struct work_struct *work) +{ + struct asus_drvdata *drvdata =3D container_of(work, struct asus_drvdata, = wmi_work); + u8 report_data[FEATURE_KBD_REPORT_SIZE]; + int report_size; + unsigned long flags; + int ret; + + spin_lock_irqsave(&drvdata->wmi_lock, flags); + memcpy(report_data, drvdata->wmi_data, drvdata->wmi_size); + report_size =3D drvdata->wmi_size; + spin_unlock_irqrestore(&drvdata->wmi_lock, flags); + + ret =3D asus_wmi_send_event(drvdata, ASUS_FAN_CTRL_KEY_CODE); + if (ret) { + if (ret !=3D -ENODEV) + hid_warn(drvdata->hdev, "Failed to notify asus-wmi: %d\n", ret); + + /* Fallback: pass the raw event to the HID core */ + hid_report_raw_event(drvdata->hdev, HID_INPUT_REPORT, + report_data, report_size, + report_size, 1); + } +} +#endif + static int asus_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -397,6 +431,9 @@ static int asus_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { struct asus_drvdata *drvdata =3D hid_get_drvdata(hdev); +#if IS_REACHABLE(CONFIG_ASUS_WMI) + unsigned long flags; +#endif =20 if (drvdata->battery && data[0] =3D=3D BATTERY_REPORT_ID) return asus_report_battery(drvdata, data, size); @@ -422,19 +459,18 @@ static int asus_raw_event(struct hid_device *hdev, * pass to userspace so it can implement its own fan control. */ if (data[1] =3D=3D ASUS_FAN_CTRL_KEY_CODE) { - int ret =3D asus_wmi_send_event(drvdata, ASUS_FAN_CTRL_KEY_CODE); - - if (ret =3D=3D 0) { - /* Successfully handled by asus-wmi, block event */ +#if IS_REACHABLE(CONFIG_ASUS_WMI) + spin_lock_irqsave(&drvdata->wmi_lock, flags); + memcpy(drvdata->wmi_data, data, min_t(int, size, sizeof(drvdata->wmi_d= ata))); + drvdata->wmi_size =3D size; + spin_unlock_irqrestore(&drvdata->wmi_lock, flags); + + if (!drvdata->wmi_work_disabled) { + schedule_work(&drvdata->wmi_work); + /* Successfully handled asynchronously, block event */ return -1; } - - /* - * Warn if asus-wmi failed (but not if it's unavailable). - * Let the event reach userspace in all failure cases. - */ - if (ret !=3D -ENODEV) - hid_warn(hdev, "Failed to notify asus-wmi: %d\n", ret); +#endif } =20 /* @@ -1350,6 +1386,10 @@ static int asus_probe(struct hid_device *hdev, const= struct hid_device_id *id) hdev->quirks |=3D HID_QUIRK_NO_INIT_REPORTS; =20 drvdata->hdev =3D hdev; +#if IS_REACHABLE(CONFIG_ASUS_WMI) + INIT_WORK(&drvdata->wmi_work, asus_wmi_work); + spin_lock_init(&drvdata->wmi_lock); +#endif =20 if (drvdata->quirks & (QUIRK_T100CHI | QUIRK_T90CHI)) { ret =3D asus_battery_probe(hdev); @@ -1460,6 +1500,11 @@ static void asus_remove(struct hid_device *hdev) if (drvdata->quirks & QUIRK_HID_FN_LOCK) cancel_work_sync(&drvdata->fn_lock_sync_work); =20 +#if IS_REACHABLE(CONFIG_ASUS_WMI) + drvdata->wmi_work_disabled =3D true; + cancel_work_sync(&drvdata->wmi_work); +#endif + if (drvdata->xgm_led) led_classdev_unregister(&drvdata->xgm_led->cdev); =20 --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D0E237DEBE; Sat, 13 Jun 2026 15:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364650; cv=none; b=LrsG+e0AC+0bVT6XH9vSeuJ36kOSb8fFA5NY4N7E4l5yQJbTcYzf2UscwyEzIS3ZCIY63XzNPpCJb3B0/SQlCZLnpvTusAZks99pFQSslLXfN3Ocrafs5kFNX042+rGVo5PRX5skroj6xFu9hpBZo0ywenAmFMXtqSiTHXPUeVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364650; c=relaxed/simple; bh=4A9C+MRJonHGH8AKMnqTFw2JppVk6sqJ3bJzAHwgYc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jU8zjywl2BJV+wpZ+pPDZXmPPeuoc8RFYZkk7/4U+2QzJY7Kw/kNtkMfrxNAje7ze2o9szm5YAaizTZGAn1tvtkYLIxBk9G5iQntzTOxP1iBdkB0G3qA9TISZPWbF9zZLoWiF7yCk4p8Sa9lyFGruFgD+uAvaKBN69FMEM8e19Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=VcVzC1BX; arc=none smtp.client-ip=91.218.175.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="VcVzC1BX" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rjPR/AWg2T6hDawoDr1XEJbq6oh85/Vhn3lYrwS/uus=; b=VcVzC1BXW9tJoBIEf5RrvQ2FEe+rtpBk72V4RnOhmDSvSbFi5828+3RaUrS9aaNR5/LfMH DU3GJAIGG1iiYH5sS8mIG2jcZkU6DtIUTZz0UgmDQr0RJNdLKQV5xO19J2MCPM6xz1wty5 dEBLjmWo04/6ca7IBDTay6g8Vgqw76A= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" , sahiko-bot@kernel.org Subject: [PATCH v3 6/8] HID: asus: prevent a late KEY_FN_ESC to trigger a use-after-free Date: Sat, 13 Jun 2026 15:30:27 +0000 Message-ID: <20260613153029.2559774-7-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" A late KEY_FN_ESC event can trigger asus_event() and unconditionally call schedule_work() after the work was supposedly canceled. Once the driver is removed and drvdata is freed by devres, the workqueue could execute asus_sync_fn_lock() and dereference the freed drvdata. Fixes: f631011e36b8 ("HID: hid-asus: Implement fn lock for Asus ProArt P16") Reported-by: sahiko-bot@kernel.org Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index a6467172c455..a65a28137f0d 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -148,6 +148,7 @@ struct asus_drvdata { int battery_stat; bool battery_in_query; unsigned long battery_next_query; + bool fn_lock_sync_work_disabled; struct work_struct fn_lock_sync_work; bool fn_lock; #if IS_REACHABLE(CONFIG_ASUS_WMI) @@ -416,7 +417,7 @@ static int asus_event(struct hid_device *hdev, struct h= id_field *field, case KEY_KBDILLUMTOGGLE: return !asus_hid_event(ASUS_EV_BRTTOGGLE); case KEY_FN_ESC: - if (drvdata->quirks & QUIRK_HID_FN_LOCK) { + if (!drvdata->fn_lock_sync_work_disabled && (drvdata->quirks & QUIRK_HI= D_FN_LOCK)) { drvdata->fn_lock =3D !drvdata->fn_lock; schedule_work(&drvdata->fn_lock_sync_work); } @@ -1497,8 +1498,10 @@ static void asus_remove(struct hid_device *hdev) cancel_work_sync(&drvdata->kbd_backlight->work); } =20 - if (drvdata->quirks & QUIRK_HID_FN_LOCK) + if (drvdata->quirks & QUIRK_HID_FN_LOCK) { + drvdata->fn_lock_sync_work_disabled =3D true; cancel_work_sync(&drvdata->fn_lock_sync_work); + } =20 #if IS_REACHABLE(CONFIG_ASUS_WMI) drvdata->wmi_work_disabled =3D true; --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 093AB38889B for ; Sat, 13 Jun 2026 15:30:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364653; cv=none; b=MX3v3UyDjEBvID5xoXvoERdGh7VSgWRW3dctqtIu+3RwFUVY5XPLOnTanre0K4BydvTjia5osWmuv+b5zl6k3g+8KOS93evXTJegM7hY32cLnaXFnxkdZlYmFoiZhG6opP+s4SlKehbWiBSpNOW4ogacmLZkziBkvK2rF6h+iFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364653; c=relaxed/simple; bh=R46HZEWAY/6K7SR3TihiVjxufikA+4np5ulTqSFXS/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aYsIbKNl2dMiZqHGNALRm8qzSDr68tt1Vi+5CrsYFQy5Cqjp4Azp5Vg/pFw1O3JJuCdfx0+5kbmm+b6FrWngsH524T4l9x22RBLs0/XxFbWe8hN7NzaBtsu81vJ+36e2+PXz2scuT4QRubfS64So5mU8uhejqqrIdb4XdZQbRAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=pG20M29S; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="pG20M29S" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rqjE9eojgJJGAkCyoCWBzVG7NmRfQCQTKogLH3/JVws=; b=pG20M29Sg+K+xndF7U7/bOwSHS9ko7cC+c15ZgKYkwX/bDeEZZZp68wiCX7csY0j5VpbDX FMKZ/drseZM3zom4vybkf0GfZUqvzuFYJ2dsm9A9hal3tcNQlCZzkb1Rx8jnF7ZHuPclhW OfJVH18T/3Qwyxb7pQlfWOF2bvqmq7E= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" Subject: [PATCH v3 7/8] HID: asus: add i2c entry for FA808UM and other TUFs Date: Sat, 13 Jun 2026 15:30:28 +0000 Message-ID: <20260613153029.2559774-8-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" On newer TUF laptops the keyboard HID device uses the same PID/VID of a USB device that was found in ROG laptops: add it to hid-asus as i2c too. Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index a65a28137f0d..efad6b623e65 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1646,6 +1646,9 @@ static const struct hid_device_id asus_devices[] =3D { { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_HID_FN_LOCK }, + { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, + USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2), + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_HID_FN_LOCK }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, --=20 2.47.3 From nobody Sat Jun 13 23:41:30 2026 Received: from out-178.mta0.migadu.com (out-178.mta0.migadu.com [91.218.175.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EFFE38E11C for ; Sat, 13 Jun 2026 15:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364654; cv=none; b=J7k7ZmUK2+h8wlxot/BJLo+ksuRXj65WeUWTGBiMqsM/1eHSUMBV/Se3gVHATkF0CQu7Tlf2ChZrR2LDtDL4ZBo1JCQGhfyOyxu/bJHcKDX24h93N17Pb3AiNdU/KQp0Vlc8sNKDZKan4v56pC7NVSx/HgH6IWp58k0zOh3z50Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781364654; c=relaxed/simple; bh=TUl7RaPF5P2FVFlE8jmILZaFIXvRQi8fCeGscBl9iEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oweciwSds36b/vPc/usYU4VednzHaTntvfZaad50xrLvErzz6QM1vzf2WY082r6H3FtkHi1tpsY5rfA/Isu8MMTPpE/vO73bPe7ka+1hcH/B8qHReu+DTLvp2IIWJxBNJ+3sb9+18puMK8z0tSZ2tJB9t8Obsbs2/yOUBlq7a1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=JdR8pI9u; arc=none smtp.client-ip=91.218.175.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="JdR8pI9u" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1781364642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nql18V0Kaa5ElLjWRTE4tW771fgioE0H2BkTX87w1Us=; b=JdR8pI9uk2AITccC7oqWL4PvTonUDbVWUUyVVvvicr3103vL7iDREqEe2Jdw/f3VUsFWxF yg2vL0mHDetAg/Bz+QTu6pWsOFu9tC5Z4vZ+PX7ADZPQdSkkf3h791JpVWWSr/FJcn1lK0 YVL0/CxtRM5KQOd56Hvxfry5Y1oExOw= From: Denis Benato To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org, "Benjamin Tissoires" , "Jiri Kosina" , "Luke D . Jones" , "Mateusz Schyboll" , "Denis Benato" , "Denis Benato" , "Antheas Kapenekakis" , "Connor Belli" Subject: [PATCH v3 8/8] HID: asus: remove unnecessary OOM message Date: Sat, 13 Jun 2026 15:30:29 +0000 Message-ID: <20260613153029.2559774-9-denis.benato@linux.dev> In-Reply-To: <20260613153029.2559774-1-denis.benato@linux.dev> References: <20260613153029.2559774-1-denis.benato@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" If devm_kzalloc fails an allocation error is already being reported: there is no need for the driver to repeat it, moreover if this were new code checkpatch.pl would throw a warning. Signed-off-by: Denis Benato --- drivers/hid/hid-asus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index efad6b623e65..f1fe3358a298 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1322,10 +1322,8 @@ static int asus_probe(struct hid_device *hdev, const= struct hid_device_id *id) int ret; =20 drvdata =3D devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL); - if (drvdata =3D=3D NULL) { - hid_err(hdev, "Can't alloc Asus descriptor\n"); + if (drvdata =3D=3D NULL) return -ENOMEM; - } =20 hid_set_drvdata(hdev, drvdata); =20 --=20 2.47.3