From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15DD0346AC0 for ; Tue, 25 Aug 2026 10:31:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787653893; cv=none; b=rbZMWwzING94iIzQUDaZGwWWLwjK1HLYQ70IxNhU/4zOBQJ6fQKnfRXUKCXxwxQX0u9dfmqfi6bUm1OGcwuphPVpzCckdWKyMVB+uizgJyBxpghKvRLnkYbGq6pqruCm5TYvIHbCIXIa3JcTfizL3SlujtnYgs/7lrxYautADHw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787653893; c=relaxed/simple; bh=nwJF8hkMevEUdXZN81gBgVbQ4KN3f7jxnXKdwBGkXhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o00e9vBJdEODWhkNRlZrCf50l46QyeLKq03z3VqJjYZacqIASh8p/XLUY1kGT7IPzH58y2IIJlqyXwZpth5rj35ExZ4j/OsbEzS+ixH0v0sAEojZXTknHQAwe/o3hgtgOipS+FqLPpGXCY8GxSv4ZHZXqCYbExUP9WjAFnGWfNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XSSYYwjD; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XSSYYwjD" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-38e42560ebcso3658616a91.1 for ; Tue, 25 Aug 2026 03:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787653891; x=1788258691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Z+eJlGm04XkGO4oIFm6Hc5DTMF8bceRHtuCJpJJ7D9Q=; b=XSSYYwjDgR7th5xtppIbXB5F2ZvylxEblmzi/bDfpMFGayfnojUwv/N1hew/r6pk7h ZwEtcwZhSSUoyibEdxlDclJ//pkwt8sC/iOiVHTzsqIpgxmoHc3l0ODQF4LHiHp45lrd KAczJ1OgBVbln3+x68BVKtiKxiJiOvfcWD6+oCiiX8sVZlwtLI/d6PC8Xgk7FBWahLyM pnXJRO9ErTB0N+2h4r19Cr4pxcLVCJXh0RPNAhtK+x7bXaOYeQJvLa/Fqhxo1+RHmaD2 LYEdTvYqyFBulAShcHmlUubGpbRr/8hUyW7HXKx+Qq8Avnwn9r3KAl+pMm86F9MFDDlp pO0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787653891; x=1788258691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Z+eJlGm04XkGO4oIFm6Hc5DTMF8bceRHtuCJpJJ7D9Q=; b=SCyyzhof0mWpdBaMAVlYcQdNNNoXs0tSDFYyaV1Fm78UckMs3h7PCkWD5wLid1raeP qrU9qbYaIMox4DuslGbd/66ihkeVgsuP77x6Ve7Hfwm+vi3wuu/hfpwcrg+XvTa4We5X UvO4FhzULgZN1dewN+3+pJhkFqaivCcPUnQ2JSydyGK9GT/lTursW4w7UOL2nQxPupac CZ42Tni/G7ION+Sq5FzN7RKXM/V9ph9wxM5G2KKQhbMwPi/UXTRbbMOuNvLdR4D53a9L i2HLk2dHRLJYGb6bGdk3YLgmZdgqXVTiNnJguE/c4EDbN9ZGPRoy372uDEuHc3qeLOv0 fNgA== X-Forwarded-Encrypted: i=1; AHgh+Rpxyt9LWqMqJEaNMVOFoJ/s730+NowD9o9bE/jqI7yNWs2DUhnhwG+7P8aGSWyN85ywMmXm3X6ugOYSlCA=@vger.kernel.org X-Gm-Message-State: AFuF++nFkePX2OyBi4Gia/6pdvmGvD5l2P1CLtQPXE+BBTZWtXU1Vx8q WrPOG2/zdqkeSYxyH7ST7Gy4ebMadqpMYCBSMRrdziF5l0aNLcHFUiV7 X-Gm-Gg: AR+sD13nL4KCRy8X2lGsQOub3sVmuJv+oetpCg2zARBpqkZBgK2137kzbaIjgqyNbSo rnYCJQHPVYmZf6ZB/XVpQkaUE4MgTdVLTGvCuDbdKDNECETyUREE+KV4TVAE9mNW97SVAUkkXq5 DY0sFklJse/48p7ZU7Uz0pk1PCYyAn2GziEHUZ0AO7I7/Ygr9e1wIh6s12kKBLf/A+7o1nMCwvj RSDC9lHo/E7eFPB8KaQtfR2SXbG4LBSuBs2/uBESxuCHQz8j31BoezFnmAenXS4yiw+lhH9VvFW 4Fayqy7/IB1bKrCc5XuaM1c1plaIRIUX+DuxG9CnXPG0BXzLPSUJhJR33Voarvoidz86CvBMMGp 4UdW19NRX4GDqb1aLC6RRFjeIz5G/eU3h5coQRAAMt02gSjsEBFLdyZlZad66D+xkEGNppeBomE Q0q3L2iwwSgKIf0k3X2KhNLmrJpm3H7PZglBXfKiiB8cFapCqSpT5CvPIxaTE/W3gNqnA5Ujrrc 5xUwUPOU58CnptXYNuyfa2TLrkcqo+WmswV8egLeOk/922Vc5PW4B+HHN6hCTMOx1RTxya6ahJ5 S9TufpyJtiQykDW6EhiLGLGT+uYOb9JFefQ= X-Received: by 2002:a17:90b:184f:b0:395:5f43:4ec4 with SMTP id 98e67ed59e1d1-3964603084fmr11994838a91.0.1787653891187; Tue, 25 Aug 2026 03:31:31 -0700 (PDT) Received: from LAPTOP-UUUVNN1I.localdomain (bb119-74-6-224.singnet.com.sg. [119.74.6.224]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39645d31e8csm3244968a91.9.2026.08.25.03.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2026 03:31:30 -0700 (PDT) From: Wei Jie Law <98lawweijie@gmail.com> To: Dmitry Torokhov Cc: Andrew Duggan , Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v4 1/2] Input: synaptics-rmi4 - fix irq[] overrun with 7 interrupt sources Date: Tue, 25 Aug 2026 18:31:22 +0800 Message-ID: <20260825103123.12216-2-98lawweijie@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260825103123.12216-1-98lawweijie@gmail.com> References: <20260825103123.12216-1-98lawweijie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit rmi_read_pdt_entry() takes the interrupt source count straight out of the Page Description Table entry the device supplies: entry->interrupt_source_count = buf[4] & RMI_PDT_INT_SOURCE_COUNT_MASK; RMI_PDT_INT_SOURCE_COUNT_MASK is 0x07, so the value can be 7, and rmi_create_function() copies it verbatim into fn->num_of_irqs. But struct rmi_function declares int irq[RMI_FN_MAX_IRQS]; with RMI_FN_MAX_IRQS == 6, and both rmi_create_function_irq() and rmi_unregister_function() index that array up to fn->num_of_irqs. A device declaring 7 interrupt sources for a function that has a handler -- F01 always does -- makes the driver write irq[6], which is the storage of the following member, unsigned int irq_pos. The function's position in the interrupt bitmap then holds a Linux virq number, and that value feeds set_bit(fn->irq_pos, ...) in rmi_f11_probe()/rmi_f12_probe() and the irq_dispose_mapping() loop on teardown. UBSAN reports every store in the loop body and the read on the unregister path: UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:183:10 index 6 is out of range for type 'int [6]' Workqueue: events uhid_device_add_worker dump_stack_lvl+0x64/0x80 __ubsan_handle_out_of_bounds+0xc8/0x100 rmi_function_probe+0x1c1/0x210 [rmi_core] UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:186:28 UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:187:35 UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:189:32 UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:191:54 UBSAN: array-index-out-of-bounds in drivers/input/rmi4/rmi_bus.c:282:30 Size the array to match the three bit field that feeds it. Clamping num_of_irqs instead would silently drop an interrupt source a device is allowed to declare, and would desynchronise irq_pos for every function created after it. Reproduced with an emulated RMI4 device that publishes a single F01 PDT entry with interrupt_source_count = 7, driven over /dev/uhid and again over dummy_hcd plus raw-gadget, on v6.12.69 and v6.12.105 with CONFIG_UBSAN_BOUNDS=y. No reports after this change, and the same device now probes normally. Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to irq_domain") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-5 Assisted-by: GLM:glm-5.3 Signed-off-by: Wei Jie Law <98lawweijie@gmail.com> --- Changes in v4: - No code change: adds the Assisted-by tags required by Documentation/process/coding-assistants.rst. The diff has been unchanged since v1. drivers/input/rmi4/rmi_bus.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/input/rmi4/rmi_bus.h b/drivers/input/rmi4/rmi_bus.h index 90122df21f74..faf2ebb00d52 100644 --- a/drivers/input/rmi4/rmi_bus.h +++ b/drivers/input/rmi4/rmi_bus.h @@ -12,10 +12,13 @@ struct rmi_device; /* - * The interrupt source count in the function descriptor can represent up to - * 6 interrupt sources in the normal manner. + * The interrupt source count in the function descriptor is a three bit field + * (RMI_PDT_INT_SOURCE_COUNT_MASK), so a device can legitimately declare up to + * 7 interrupt sources for a single function. irq[] must be able to hold all + * of them: rmi_create_function_irq() and rmi_unregister_function() both walk + * it up to fn->num_of_irqs. */ -#define RMI_FN_MAX_IRQS 6 +#define RMI_FN_MAX_IRQS 7 /** * struct rmi_function - represents the implementation of an RMI4 -- 2.43.0