From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795059231; b=LHJRuLecrW51yi0Nmq0jJL0E+QmOY8u+qmhJJdohGWbO66l3UjYsP6LJqqmRadMjVWmv CcPKLoe43zBZWKLBvSlB8lZyPoAOE66hrCymTBzZS8H8M/b4N6k5ln8OEocllY9hXioKx JwCeMbT2YWYwI1RkdjE4ueDCVRTSxplz4F1EGtQ+JGaMzDzJsrimzEpV1DjM1BwJthDaJ qi2uINd1Zw1leFtxNKDyVpBrN5WmhRzpOWThYcqAXvVG4OnedB/yjpmz75QMKWgWVvdlW dIBmCY1HZoiGEcVQ8UXPyhDvVDZhBo6Nx9gZg+VoT+z5gHk1LarIdNPcC6g+TgYSqKg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059231; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=KRcz0sVquGIXCWFBp64hG0V761agTmtbLDIY4N65MBU=; b=Feg4eVHAfca2GL2JpvLNhIb/gHzos1+2uhNbhvhSzDnOlsvRuTBDzDmgVLQ9LXCpfmYF fSyOI4lWiOhSBMvS3WcD8QBaqacgmwmnGrrEJhNd8r6AgG4bGLPATeX5XpNO5G8Z6Yevw Sb7aqR6PPBnMJC+ehopg9+OMsFTkZ1MitwO+iB9axZu96dGSZ51Dp4bSb+hOGf/i7T1um YDZMDlhVdzZmEqS0UtYg2PyNSVOvUN2Fa6lAhT9JJmh9kbV3j8WR4LW7kKNV3TfDVPVyv HvUuWW18ujbSdhLrtlQSlFHuw9xiLlfoIbgHJkscKRurdrfmrP/QSgD5HrNR8Uzy9ww== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OHHg1Yxk; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5029D606A31C; Thu, 19 Nov 2026 03:33:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OHHg1Yxk Received: by smtp.kernel.org (Postfix) with ESMTPSA id A46C61F000C4; Thu, 19 Nov 2026 03:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059231; bh=KRcz0sVquGIXCWFBp64hG0V761agTmtbLDIY4N65MBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OHHg1YxkVdkuPnxe6/OFjJSwe9WK5Ze/4wETt/ZuI9FZthxKywXOOoIr4XMNGbqoI w/jWzi2f65Eg//KmYWHabwX5/CZEEqAy0mdt6V55Bi2Xowx9/otSmkaFHYOp5JyrVi 3doXh68jqWq6M3GtgFab7NY+5LoC8ccyl3WhfxLI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lee Jones , Ping Cheng , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 0769/1848] HID: wacom: Fix Use-After-Free in wacom_intuos_pad Date: Wed, 18 Nov 2026 15:46:47 +0100 Message-ID: <20261118145948.590077760@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lee Jones [ Upstream commit ef32877368a7013c060ef6bd03a30b6da2fe0c41 ] wacom_intuos_pad() accesses wacom->shared->touch_input locklessly inside the interrupt handler context. If the Touch sibling device is disconnected, wacom_remove_shared_data() clears 'touch_input' outside any lock, creating a Time-of-Check to Time-of-Use (TOCTOU) race condition where a preempted reader in interrupt context dereferences the freed pointer, leading to a Use-After-Free. Resolve this by introducing RCU protection for the touch_input pointer: - Annotate 'touch_input' in wacom_shared struct with __rcu - Wrap all lockless readers in wacom_wac.c with guard(rcu)() and rcu_dereference() using a unified wacom_report_touch_mute() helper - Update writers in wacom_sys.c using rcu_assign_pointer() - Call synchronize_rcu() in wacom_remove_shared_data() to ensure all active RCU readers have finished before the input device is freed Also wrap wacom_set_shared_values() and touch/pen assignments in wacom_add_shared_data() inside the wacom_udev_list_lock to serialize concurrent probe assignments, and verify that 'shared->touch == hdev' before setting touch_input to prevent concurrent sibling probe state desynchronization. Cc: stable@vger.kernel.org Fixes: 961794a00eab ("Input: wacom - add reporting of SW_MUTE_DEVICE events") Signed-off-by: Lee Jones Acked-by: Ping Cheng Tested-by: Ping Cheng Signed-off-by: Jiri Kosina [Lee: Use explicit mutex_lock()/mutex_unlock() in wacom_remove_shared_data() for -std=gnu89 compatibility and adapt to res_wacom] Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/hid/wacom_sys.c | 18 +++++++++++++----- drivers/hid/wacom_wac.c | 36 ++++++++++++++++++------------------ drivers/hid/wacom_wac.h | 2 +- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index e5d12683f5784..94e12c56e040a 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -885,10 +885,16 @@ static void wacom_remove_shared_data(void *res) data = container_of(wacom_wac->shared, struct wacom_hdev_data, shared); - if (wacom_wac->shared->touch == res_wacom->hdev) + mutex_lock(&wacom_udev_list_lock); + if (wacom_wac->shared->touch == res_wacom->hdev) { wacom_wac->shared->touch = NULL; - else if (wacom_wac->shared->pen == res_wacom->hdev) + rcu_assign_pointer(wacom_wac->shared->touch_input, NULL); + } else if (wacom_wac->shared->pen == res_wacom->hdev) { wacom_wac->shared->pen = NULL; + } + mutex_unlock(&wacom_udev_list_lock); + + synchronize_rcu(); if (kref_put_mutex(&data->kref, wacom_release_shared_data, &wacom_udev_list_lock)) mutex_unlock(&wacom_udev_list_lock); @@ -2344,9 +2350,11 @@ static void wacom_set_shared_values(struct wacom_wac *wacom_wac) } if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) { - wacom_wac->shared->type = wacom_wac->features.type; - wacom_wac->shared->touch_input = wacom_wac->touch_input; - wacom_wac->shared->touch = wacom->hdev; + if (wacom_wac->shared->touch == wacom->hdev || !wacom_wac->shared->touch) { + wacom_wac->shared->type = wacom_wac->features.type; + wacom_wac->shared->touch = wacom->hdev; + rcu_assign_pointer(wacom_wac->shared->touch_input, wacom_wac->touch_input); + } } else if (wacom_wac->features.device_type & WACOM_DEVICETYPE_PEN) { /* Pairs with smp_load_acquire() in wacom_sibling_pending() */ smp_store_release(&wacom_wac->shared->pen, wacom->hdev); diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 8804bc2cba32d..059572ea05097 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -510,6 +510,18 @@ static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac) } } +static void wacom_report_touch_mute(struct wacom_wac *wacom_wac, bool mute) +{ + struct input_dev *touch_input; + + guard(rcu)(); + touch_input = rcu_dereference(wacom_wac->shared->touch_input); + if (touch_input) { + input_report_switch(touch_input, SW_MUTE_DEVICE, mute); + input_sync(touch_input); + } +} + static int wacom_intuos_pad(struct wacom_wac *wacom) { struct wacom_features *features = &wacom->features; @@ -650,12 +662,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) input_report_key(input, KEY_CONTROLPANEL, menu); input_report_key(input, KEY_INFO, info); - if (wacom->shared && wacom->shared->touch_input) { - input_report_switch(wacom->shared->touch_input, - SW_MUTE_DEVICE, - !wacom->shared->is_touch_on); - input_sync(wacom->shared->touch_input); - } + if (wacom->shared) + wacom_report_touch_mute(wacom, !wacom->shared->is_touch_on); input_report_abs(input, ABS_RX, strip1); input_report_abs(input, ABS_RY, strip2); @@ -2191,7 +2199,7 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field */ if ((equivalent_usage == WACOM_HID_WD_MUTE_DEVICE) || (equivalent_usage == WACOM_HID_WD_TOUCHONOFF)) { - if (wacom_wac->shared->touch_input) { + if (wacom_wac->shared) { bool *is_touch_on = &wacom_wac->shared->is_touch_on; if (equivalent_usage == WACOM_HID_WD_MUTE_DEVICE && value) @@ -2199,9 +2207,7 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field else if (equivalent_usage == WACOM_HID_WD_TOUCHONOFF) *is_touch_on = value; - input_report_switch(wacom_wac->shared->touch_input, - SW_MUTE_DEVICE, !(*is_touch_on)); - input_sync(wacom_wac->shared->touch_input); + wacom_report_touch_mute(wacom_wac, !(*is_touch_on)); } return; } @@ -3292,11 +3298,8 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len) if ((wacom->shared->type == INTUOSHT || wacom->shared->type == INTUOSHT2) && - wacom->shared->touch_input && wacom->shared->touch_max) { - input_report_switch(wacom->shared->touch_input, - SW_MUTE_DEVICE, data[5] & 0x40); - input_sync(wacom->shared->touch_input); + wacom_report_touch_mute(wacom, data[5] & 0x40); } pid = get_unaligned_be16(&data[6]); @@ -3331,11 +3334,8 @@ static int wacom_status_irq(struct wacom_wac *wacom_wac, size_t len) if ((features->type == INTUOSHT || features->type == INTUOSHT2) && - wacom_wac->shared->touch_input && features->touch_max) { - input_report_switch(wacom_wac->shared->touch_input, - SW_MUTE_DEVICE, data[8] & 0x40); - input_sync(wacom_wac->shared->touch_input); + wacom_report_touch_mute(wacom_wac, data[8] & 0x40); } if (data[9] & 0x02) { /* wireless module is attached */ diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 0de34c13e7a10..957247e6ba1c9 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -286,7 +286,7 @@ struct wacom_shared { /* for wireless device to access USB interfaces */ unsigned touch_max; int type; - struct input_dev *touch_input; + struct input_dev __rcu *touch_input; struct hid_device *pen; struct hid_device *touch; bool has_mute_touch_switch; -- 2.53.0