From nobody Fri Sep 25 23:10:00 2026 Received: from mail-wr2-f12.google.com (mail-wr2-f12.google.com [74.125.225.76]) (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 BAD9D3B14D5 for ; Mon, 7 Sep 2026 18:50:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788807018; cv=none; b=qJXxl1gfXyHem9je/voy99VyRfxOtCREwndFUoXI4fyNU2y8Dl0TgoRkBSJ7xCmtNW5zbuWaVWDP486V5sBFO99zuBL8DfzaO9z4kusDQx+HE7jAH/fMMB7tqZmgvy0dX709IQHhdpPuqgVFag3/gB3hZLgxc+GBG19JqpyrU/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788807018; c=relaxed/simple; bh=J9BZRX6oP1MPxPyLTPWVaWjRNa4HUnYcg26VY3Rb6Zo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Nwd2KZfT8hXlpki7H1t9f4EEz0PLLLx9kaCs+8SDU2W+EgAte5erNHRLLzhhniYXusXtTrLElSB4EGFYT/5QKt7R5qj+6nvsVIZM/m6cGWSJVQCSG4dmL7cBZWdKmMBb3s4Jz7xiecrQSI31jahyannWsGFzSrBEgm9cxiuIAv8= 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=JEJve51b; arc=none smtp.client-ip=74.125.225.76 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="JEJve51b" Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-4843971bdd0so403430f8f.1 for ; Mon, 07 Sep 2026 11:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788807004; x=1789411804; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=rOfBbKNvf4wumPkciSn2R6wvTiBsYFrhYc9rrrbfPSA=; b=JEJve51ba4qmTYywtPrxmTgZDV+nx4L6v/EyhZZ1UBWMZDVUXMZVzNWpfZlfGkOm8B htGgT+WhPbUI3EVRc9DhocNSUlJKktQPMiY/VWiGX9f3m93iMuTX5kwEaqr9Au1FfwGn RoBHwY74HEhpMSUv8EdKs2wl62WkQ5TR/Ba4wwoSJxKes4avtnRDhky7RBRN6775U7ZE pvRBoJKxtUYO6yCgep9dzxgjjQzAYh3bNV+VTQwLJ7mQPc87KPSJjJpG+Ifk+Ijk57kc imjfcc/cw3VzI6iw0ZWzHJr4M/Z8RNDdAGh1NNfa2gvMIGpDgizfHFQt37sw5GobY+4X Gr+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788807004; x=1789411804; h=content-transfer-encoding:mime-version: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=rOfBbKNvf4wumPkciSn2R6wvTiBsYFrhYc9rrrbfPSA=; b=PP15FH0sD3K/rMu4dpcn7GQYYom9rMUV5t+0Z4vxKS815Qf+FCyOD1KHF9WV3e/VmU /BdlaXlbgdwMyVqzxFS7vtCDkR7lfqsgJfIeZq89f6vEcm2qvlLb9pcjiPE8Ft0C+q7P 7J6Ity1TEFRM1lvzHMx2QFBXF3yIur5PihwSJTOCSKbvtFCqk+Jn4V3ss4fzDp/YNi9C vce+E6THDZng2vmO8zF+KBk7O4ilsbOUJ29JBeA1lsKkEoaa9x8gSPK4tZ401IMB7b8V lxxOzU2tx2ARIuLu71tbyBtXSQ5q5U2myieKUfnOuyT+TiX4938M+nHETxnQo308xdt4 qzMQ== X-Forwarded-Encrypted: i=1; AKwUvByGRUhOeBBUUvaHOIxN/9svQeJvER/0GI6aH3xNR3nOxSe9FbQ3lFUdq7WRt9ryVVa7uV8CjAfakzDwaiA=@vger.kernel.org X-Gm-Message-State: AFuF++n9EqMSUc98lAFaYrbiWkqMr6ZXGmcxctL8qc7aY9jPcWQounEA T1teSDwIt7BsIVsZ20mT1y/+ZHL7NON/CqAw/fMN9589NUfDI28gYv6lEOWzrJLIo2iB/w== X-Gm-Gg: AYBFou3+halVSVKRj1vKm2zGdTWg1lE0PY0zJl1dj+HHphfsrNZuJZss+1y7bDeqTAM qw2k1v0vo8UVCiNyqceJWgzWCG5Rth5qwlT1jwFkXUDgdP5q/kg44BBBWUYkTioFJj3g7ZXoPrL gARO0s5D4I55xf5NvzQH6m8j2IfKKAR+MKBQa1PaWNO5lGOyTYoRyPcbZujHKAmL/Q50IwWK0eT R6HA45xJ5+aORO3Yb6XfFTzP/Ae9tQBFg8jTMinqtxRUCUabvhyZ9lLACd7M2JzlVhi2JtQls/V QM/mwI5gYA8uVsta3zP990dJ63HpaXD4VkK50f5iwEx5x3sG9XD/+XdXS8P3eSPV4AJlPGTL/8J JlaMosw51akl1jSr9kvVnbBbpwy5wy5TLQIpRqQoaXtMq3Ol7iphGWdvozed70cVvMeCfw7oUhl b/J9hc5GiNZM8Xp2k4UdCI3xZk4OQZ/lcdT1v18ZxNP5k4wkIWcQB+uotHZakg0IRsa5dJNngDx MVmOCk0oEio3yMacjkg5M0diuTM3IYpYC7Neg/0MxcUnYfAVACkqkeGbN0adgOc3HVroMMWXCSD Iy9P47LqzGY+ig== X-Received: by 2002:a05:600c:a305:b0:49c:ff81:e062 with SMTP id 5b1f17b1804b1-49cff81e076mr147773075e9.2.1788807003690; Mon, 07 Sep 2026 11:50:03 -0700 (PDT) Received: from pop-os.. (98.102.222.87.dynamic.jazztel.es. [87.222.102.98]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce591f846sm203600315e9.1.2026.09.07.11.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 11:50:03 -0700 (PDT) From: Miguel Garcia To: stable@vger.kernel.org Cc: dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org, pengpeng@iscas.ac.cn, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6.6.y] Input: aiptek - validate raw macro indices before updating state Date: Mon, 7 Sep 2026 20:50:01 +0200 Message-ID: <20260907185001.1567957-1-miguelgarciaroman8@gmail.com> X-Mailer: git-send-email 2.43.0 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 Content-Type: text/plain; charset="utf-8" From: Pengpeng Hou aiptek_irq() derives macro key indices directly from tablet reports and then uses them to index macroKeyEvents[]. Report types 4 and 5 also save the derived value in aiptek->lastMacro and later use that state to release the previous key. Validate the raw macro index once before it enters that state machine, so lastMacro only ever stores an in-range macro key. Keep direct bounds checks for report type 6, which reads the macro number from the packet body and uses it immediately. Signed-off-by: Pengpeng Hou Link: https://patch.msgid.link/20260329001711.88076-1-pengpeng@iscas.ac.cn [dtor: fix macro fallback in report 5s to use -1] Signed-off-by: Dmitry Torokhov (cherry picked from commit 95dffe32a66cbed07fbfa7afed39d56d5014e04f) Signed-off-by: Miguel Garcia --- drivers/input/tablet/aiptek.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index baabc51547b83..6210cd99d6291 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c @@ -658,6 +658,8 @@ static void aiptek_irq(struct urb *urb) pck =3D (data[1] & aiptek->curSetting.stylusButtonUpper) !=3D 0 ? 1 : 0; =20 macro =3D dv && p && tip && !(data[3] & 1) ? (data[3] >> 1) : -1; + if (macro >=3D ARRAY_SIZE(macroKeyEvents)) + macro =3D -1; z =3D get_unaligned_le16(data + 4); =20 if (dv) { @@ -699,7 +701,9 @@ static void aiptek_irq(struct urb *urb) left =3D (data[1]& aiptek->curSetting.mouseButtonLeft) !=3D 0 ? 1 : 0; right =3D (data[1] & aiptek->curSetting.mouseButtonRight) !=3D 0 ? 1 : 0; middle =3D (data[1] & aiptek->curSetting.mouseButtonMiddle) !=3D 0 ? 1 := 0; - macro =3D dv && p && left && !(data[3] & 1) ? (data[3] >> 1) : 0; + macro =3D dv && p && left && !(data[3] & 1) ? (data[3] >> 1) : -1; + if (macro >=3D ARRAY_SIZE(macroKeyEvents)) + macro =3D -1; =20 if (dv) { /* If the selected tool changed, reset the old @@ -737,11 +741,11 @@ static void aiptek_irq(struct urb *urb) */ else if (data[0] =3D=3D 6) { macro =3D get_unaligned_le16(data + 1); - if (macro > 0) { + if (macro > 0 && macro - 1 < ARRAY_SIZE(macroKeyEvents)) { input_report_key(inputdev, macroKeyEvents[macro - 1], 0); } - if (macro < 25) { + if (macro + 1 < ARRAY_SIZE(macroKeyEvents)) { input_report_key(inputdev, macroKeyEvents[macro + 1], 0); } @@ -760,7 +764,8 @@ static void aiptek_irq(struct urb *urb) aiptek->curSetting.toolMode; } =20 - input_report_key(inputdev, macroKeyEvents[macro], 1); + if (macro < ARRAY_SIZE(macroKeyEvents)) + input_report_key(inputdev, macroKeyEvents[macro], 1); input_report_abs(inputdev, ABS_MISC, 1 | AIPTEK_REPORT_TOOL_UNKNOWN); input_sync(inputdev); --=20 2.43.0