From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.179 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792812660; b=wT0Ed9CwG1YNEEq4j5ydAgEY3bACsfsMOdd1xTaprTgKX3qZnUFSEgchUOFGQff+krD/ O61FTgPnumwVEK1EX62EtUxAOTJ242v1DJOAzA1c2t2mvyJq4HrydwtprQTWVheGyE+rU kG83o1uY29Xu/dswTPvFohrG5syONTr+I1QMCLovxh9SZ8He071XtuuEoz0c+MFEcmCyP QyykbP989QVU7qnlJ77lkgUqcWarUnKlYX5KmujSrADMu4G3k3olP1Vuj5kB7eWvjonBT 1W9pb7FdH6aPutmhT3vusqOfElZkADbl/Q4/Sgi1SU+2g7H8s0xyGKxT2wrOsP1e4Iw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792812660; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=UqibqhDXFVQTJaQLvrkge4wCU3l636dt/KCjheoRN18=; b=uKu2u0xrsUZmtOaTAPljaZFGimSnQIqNXutvZ/kAwywkmWSrnUCM8icjkOyjRc98rK/p jji+9bwKsxkE9Del4npWpjwWAQdHqt7ksP0+Kuw0BIccu+csiCTYzrULyQ20TiUvygB95 3PN020i0o3kDiJZYEUYDkQwYlvnqYAsgNi50KcBYL8VrNawodW4/H4aQ5D2LwOpPdRlYI bp11GERTcafSGdFWzzyJchF5rIbTj08TRkZzIEOZ6Rnn+B78OyLR+9Agtcf0UYwg8ulGt rVSh+LJh0oA+4VK8LQIC5+9Zay3Pdv9iICBYIBsN7QPz6MCCJRGCtgybfmbQEFyi6wQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=UwqGBi44; arc=none smtp.remote-ip=74.125.82.179 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71DB8606A31E for ; Sat, 24 Oct 2026 03:31:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 71DB8606A31E 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=UwqGBi44 Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-33fb4680717so1855088eec.1 for ; Fri, 23 Oct 2026 20:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792812660; x=1793417460; 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=UqibqhDXFVQTJaQLvrkge4wCU3l636dt/KCjheoRN18=; b=UwqGBi44/7agNy6LtbYxT0F6G+OG/eL8S9kWrd1sg+CCCt6oituJd335n9UjKBMlAm 5EB9uRdpQX4HWeCBgyNNg1eZUCJmvtZ/7Z7RzDZ8Py5NeCKvzdrBq6htAHRZGgfZFY4R YReU/naLrwX5NNn8Bg8ZIIZwOH0Lx5wGqhciWK1WlMEocRj2Tg9TXlR4dnlugkdIMnVX 3zX7c75E/MMZ1nI7RsoZBuQmr+zKN1IbOqeW9tANDe8b0E/EB0GpHzAyoxcXS3l39hyc Qe9YDwiEPjVENXS6QRsiXGHZg2ohRnN3z4yGNBTIiTcN6uXppCg3vKsqnk+4v76si5+A uywA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792812660; x=1793417460; 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=UqibqhDXFVQTJaQLvrkge4wCU3l636dt/KCjheoRN18=; b=IvkVxK63ndpyS+61CTgpb/1KtvTi3AzWAPsoCcFTfkADdZBGP/rv3UL6u8psOCUqIV vPmOYr9KSHhJ8eQKw0S4zgbB4ITX+MmOv8ShTtFS3rrTF81dUM2b4s5V4Y7ZL8cyuki/ 25vPO3tuAWQy+Y/h6HNyKL0TLptcX1USbJQBu/MeFDS4oUfeHpuN4f3nSmjHZmFEKylv Dnig4uNItktq6Rf5oh/uDAXiZHNqwFDsIaDDRkcT4M51JBWCcQiSRYVRs6h51kFOzhGW RBTk4EOS9i6wiq1a89Kko/cLvAQpRO15tm2G4jO0kd/0cDFoAtIfFlh8TwjR0YS4MfKO 3+QA== X-Forwarded-Encrypted: i=1; AKwUvBzZQ1sMiUXTXkxm0ObgTc0H+XkL4tG3n/hkUDw6cc1QiMKIGWAnQ1UnTjgBBsM2OqT+zVOdxIPtzIBWU+0=@vger.kernel.org X-Gm-Message-State: AFq9FYJVufTjnlwrnXy/ec1pQqfjX7S7lOq/Nq8pFLZc+DLNjbNNkZCT sTHkxln5OFvW5a50XtRc1q8HEtHnP/EiS7/3Hkwj2s7X1O4LPtkIu5sg X-Gm-Gg: AYBFou2Jn2ma+cyj3PfBolP/cZWuiN0UiTYuDC8F0UnGTeAp2mtBUbhVl0R0Np1OIzj HecrKK4aBMd+MsL204ozjrVnqLQIvyNaKTpTN21G2v7dR51IASXsqOJM8bVO0AfBQbSju3YRuBC chA+BvZfRq4dyCxXQdDuf0GEfRlPOJAecn1GoXcX4tsZAmJLj3gdylSCBrL5n4mbr1jwpiDQvUP 3WYolmETAG/7gBFxK5WyI+0PMmVDPKySGb4kvGmOE4ZhpOWrKmZV7HDU4VZ8rvfY3rll2DDWe5j qAdF7f9KgqitZvq+ElGQAcFNxEr1M++UzwoXnn3ML4HrJVZEB4QSfDQEl0/mNEJE3k5y55wajsr Rkl5NbWOkCwxlMY0OWpox8GpEFPJ8SlJGsvx3HUzWQnrydePqHY6QZFck9lUHWXCr/AgJvPU7p9 7FUZUqNcpC4883x2egl0F/6vuwTtLFqo1uXQtc4V0L6e/vu3JWcXCOTl9AxMCYCbCvLsPssekLF XCZxjkbmFLgh5/zRrc1xgBKkDSvPw1LRruJ/CKxKIoR8XPlxYebg5WzZIiV3sgevLcNNCjg4EbA joyE/a0xT5DpyFPYeI915mL/aY2V X-Received: by 2002:a05:7301:2b06:b0:369:9af5:7bcc with SMTP id 5a478bee46e88-369e848b9bdmr2135720eec.8.1792812659549; Fri, 23 Oct 2026 20:30:59 -0700 (PDT) Received: from jmoon.tail8e743c.ts.net ([118.220.156.4]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-369e8ecf087sm2827283eec.27.2026.10.23.20.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2026 20:30:59 -0700 (PDT) From: Jinmo Yang To: ping.cheng@wacom.com, jason.gerecke@wacom.com, jikos@kernel.org, bentiss@kernel.org Cc: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Jinmo Yang Subject: [PATCH v4 5/6] HID: wacom: add NULL input guards to Bamboo handlers Date: Sat, 24 Oct 2026 12:30:39 +0900 Message-ID: <20261024033040.316652-6-jinmo44.yang@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261024033040.316652-1-jinmo44.yang@gmail.com> References: <20260927041138.4112920-1-jinmo44.yang@gmail.com> <20261024033040.316652-1-jinmo44.yang@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit wacom_bpt_touch() dereferences both touch_input and pad_input. wacom_bpt3_touch_msg() dereferences touch_input. wacom_bpt3_button_msg() dereferences pad_input. wacom_bpt_pen() dereferences pen_input. All four can be NULL when the corresponding wacom_setup_{pen,touch,pad}_input_capabilities() returns -ENODEV during a successful probe. Add per-function guards. Fixes: 2a6cdbdd4cc0 ("HID: wacom: Introduce new 'touch_input' device") Fixes: 862cf5535c0c ("HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_type") Signed-off-by: Jinmo Yang Co-Authored-By: Claude Opus 4.6 --- drivers/hid/wacom_wac.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 6e2e67abf80e..c4d6295f57c9 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -3157,6 +3157,12 @@ static int wacom_bpt_touch(struct wacom_wac *wacom) if (data[0] != 0x02) return 0; + if (!input || !pad_input) { + dev_warn_once(&container_of(wacom, struct wacom, wacom_wac)->hdev->dev, + "%s: input is NULL\n", __func__); + return 0; + } + for (i = 0; i < 2; i++) { int offset = (data[1] & 0x80) ? (8 * i) : (9 * i); bool touch = report_touch_events(wacom) @@ -3191,8 +3197,17 @@ static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data) { struct wacom_features *features = &wacom->features; struct input_dev *input = wacom->touch_input; - bool touch = data[1] & 0x80; - int slot = input_mt_get_slot_by_key(input, data[0]); + bool touch; + int slot; + + if (!input) { + dev_warn_once(&container_of(wacom, struct wacom, wacom_wac)->hdev->dev, + "%s: touch_input is NULL\n", __func__); + return; + } + + touch = data[1] & 0x80; + slot = input_mt_get_slot_by_key(input, data[0]); if (slot < 0) return; @@ -3235,6 +3250,12 @@ static void wacom_bpt3_button_msg(struct wacom_wac *wacom, unsigned char *data) struct input_dev *input = wacom->pad_input; struct wacom_features *features = &wacom->features; + if (!input) { + dev_warn_once(&container_of(wacom, struct wacom, wacom_wac)->hdev->dev, + "%s: pad_input is NULL\n", __func__); + return; + } + if (features->type == INTUOSHT || features->type == INTUOSHT2) { input_report_key(input, BTN_LEFT, (data[1] & 0x02) != 0); input_report_key(input, BTN_BACK, (data[1] & 0x08) != 0); @@ -3289,6 +3310,12 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) if (data[0] != WACOM_REPORT_PENABLED) return 0; + if (!input) { + dev_warn_once(&container_of(wacom, struct wacom, wacom_wac)->hdev->dev, + "%s: pen_input is NULL\n", __func__); + return 0; + } + range = (data[1] & 0x80) == 0x80; prox = (data[1] & 0x40) == 0x40; rdy = (data[1] & 0x20) == 0x20; -- 2.53.0