From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi2-f12.google.com (mail-oi2-f12.google.com [74.125.231.204]) (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 C2C70388866 for ; Thu, 10 Sep 2026 03:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.204 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789010492; cv=none; b=mKTvTO7sannR5rxA+fsQBpfvedA8ksD2oxX+Hb2jvxNNYB1jdbKq4jA6vVmdslich9xJIa+hvyPpwJnhtpbWXYDEZUWdAFsK/657YGaPC8SF9dAoRRsnsPSarlw8rzO6QBYy41rez0na3yp1bjIzXnnFU3vjiBryen89L/7w5UU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789010492; c=relaxed/simple; bh=RAnQLpzPku7/sBiN9IYfkstPCRnhG64DyTCe5z9u7y8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u4t9FgphmsUSkC0UmSkwnMVRzgWGMQpmxGWaxoqRJKt7xa+xatiB5nz6J4ipahYODu/8YSbgTgLQ7apRgTnbz3HyH/tIiu6SrCP49v6TAnFgUvht2YoJvAeNst9ZPReaVPwv8KwCU/2XHZfUmPYRqVO5Ag4PUFJ6Jy8087pa8tA= 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=GeZITH3U; arc=none smtp.client-ip=74.125.231.204 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="GeZITH3U" Received: by mail-oi2-f12.google.com with SMTP id 5614622812f47-4b375b957e0so357054b6e.2 for ; Wed, 09 Sep 2026 20:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789010490; x=1789615290; 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=uB3vWkzSWUGhUPGiwsOLzELGJs5tqcYbrEX4UJLtth4=; b=GeZITH3UzsOViFtkF6z9QYo26zh0ijQHzdUlyFucjrG/2B4z4X41RZyFl+LQNDvvc3 wSb9v3TnoR5kfE/Itgu8KtyMjrtESObaGlsvjRnOYQX3yWFQBv3SjEJK33EFDgEIwFUk yIV2aG3ttc6+zqlgkm4XSviEL/zpGZEY724u2v6yzagXIA//L9hPlqKJ8eDPly1vJvVy 0c5jXQCzxq7K4vQKkmKcNz5B5FZsja64eMwI8UReOPj+fa+fWGNDJOau8FrCTLA3zJ73 ebPau1cHtliud5gAay/TQ+TOah4E3JkspJ1qwb7/TQKwquFdInzwb3QMxt///VesmHxv rJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789010490; x=1789615290; 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=uB3vWkzSWUGhUPGiwsOLzELGJs5tqcYbrEX4UJLtth4=; b=UOLIs+/2rEXltCq5SkwKWqRI3GmlBZfQlhEdBgffLCzW6D5WHjfYNj9KT2rDO9/EhO EIZ8iiVpeCArx3uzYyGZC+C+BJbasP/b6asHHrQPER7G2exKl1payJoXPiYyX/8i5ql+ YAv/GvAjiyWKBwnRVntaVDJqzGeo0xjqxcLVdi9iGVBvxqnLl8B1J8s55jOmMLDesoqQ 7tWhP+cn5bvfJXlhAReuMUmfBPFQFIYaU0ORJky03hYH9EiaMou+XrfXMrJqd95TdfdC Zm4hAc2Ez8VhRSks/idB1uWo5PoTmnfL/lFAL4f085hdSC+/hiv5Knfme/G30aSSuQyO Yx+Q== X-Gm-Message-State: AFuF++klbptztuvjRMztwNDHo5SWXmaYn9w73GYBnRi4HXi+WmKbcUR5 KoYvxrjgHgNwYlxkd0iLffgP1/cY1xzrPhg+QvB7XAvqJ9Y6cftPSeZ8 X-Gm-Gg: AYBFou3ZSDlf3T26yXsZeZLKZIGVwPBu15SUMKnQqCpRDc2cMOZal7JzUqrXlV5QciU lEUtWh8Uil2lgO/jPo/ihYnz5gYuKRZXPdgNe8krvwUQ6/GcjWH7WmdVXQ2Q557k5Q0sBdYGqe0 ha8qGT0khPi7Sl8cSJ02piiNAH/IZswhh7l0/yZZydUbp18my3AXn/HTLtMJaJuIpv8YrUrrOP3 MASjukqPEmtafnOJrvzKk/jnb/ahMKX3EXD6J6/qF6Q5PiVSmJp2dC9sPfqhh3tq5RnjXL9YTPf v/+QsjnaiIsbkR1ebPnSNnW4v/9CiDllnYxd6Jm2mJI4rNOxIRhEv/XsCqYPbKSTRUQ/fiKk5wF Em9N1gnWDd8iUgfPYVwckFFUWqgo+Y9QhDeO1EGwLnL5v57ggQuOwgn5Cailj5h0OTtGTX0dfAX lsaNHl5PeCmICY66usdD43WpOxxpGa+nUxZBdmiYAx1W5Jz9uNmaq/6cLh9XNrnl0w4ulVPEzc1 ueJ/U+Pwx47ElMJlv+aTmtPuNlBYg1jlEj7CrhhVVQr/zWUoodyy+pDGtXkpF40Ufuw X-Received: by 2002:a05:6830:83aa:b0:7e3:f809:7984 with SMTP id 46e09a7af769-8027109f9aamr2270980a34.1.1789010489743; Wed, 09 Sep 2026 20:21:29 -0700 (PDT) Received: from localhost ([76.187.192.44]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7f9f6da9a49sm19758315a34.13.2026.09.09.20.21.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Sep 2026 20:21:29 -0700 (PDT) From: Andrei Aldea To: Jiri Kosina , Benjamin Tissoires , "Derek J. Clark" Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones , Pavel Machek , linux-leds@vger.kernel.org Subject: [PATCH 02/15] HID: hid-oxp: validate input report lengths before decoding Date: Wed, 9 Sep 2026 22:21:02 -0500 Message-ID: <20260910032115.28669-3-andrei1998@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260910032115.28669-1-andrei1998@gmail.com> References: <20260910032115.28669-1-andrei1998@gmail.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Check the short Gen2 status header before reading its command, and require a complete RGB status report before reading either generation's fields. Use the supplied input length for the debug dump as well, so a short report cannot cause an out-of-bounds read while logging. Fixes: 84910c459d65 ("HID: hid-oxp: Add OneXPlayer configuration driver") Assisted-by: LLM Reviewed-by: Derek J. Clark Signed-off-by: Andrei Aldea --- drivers/hid/hid-oxp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c index 3f2be80..0c895bd 100644 --- a/drivers/hid/hid-oxp.c +++ b/drivers/hid/hid-oxp.c @@ -23,6 +23,7 @@ #include "hid-ids.h" #define OXP_PACKET_SIZE 64 +#define OXP_STATUS_HEADER_SIZE 6 #define GEN1_MESSAGE_ID 0xff #define GEN2_MESSAGE_ID 0x3f @@ -318,6 +319,9 @@ static int oxp_hid_raw_event_gen_1(struct hid_device *hdev, struct led_classdev_mc *led_mc = drvdata.led_mc; struct oxp_gen_1_rgb_report *rgb_rep; + if (size < sizeof(*rgb_rep)) + return 0; + if (data[1] != OXP_FID_GEN1_RGB_REPLY) return 0; @@ -391,6 +395,9 @@ static int oxp_hid_raw_event_gen_2(struct hid_device *hdev, struct led_classdev_mc *led_mc = drvdata.led_mc; struct oxp_gen_2_rgb_report *rgb_rep; + if (size < OXP_STATUS_HEADER_SIZE) + return 0; + if (data[0] != OXP_FID_GEN2_STATUS_EVENT) return 0; @@ -404,6 +411,8 @@ static int oxp_hid_raw_event_gen_2(struct hid_device *hdev, if (data[3] != OXP_GET_PROPERTY) return 0; + if (size < sizeof(*rgb_rep)) + return 0; rgb_rep = (struct oxp_gen_2_rgb_report *)data; /* Ensure we save monocolor as the list value */ @@ -435,7 +444,7 @@ static int oxp_hid_raw_event(struct hid_device *hdev, struct hid_report *report, { u16 up = get_usage_page(hdev); - dev_dbg(&hdev->dev, "raw event data: [%*ph]\n", OXP_PACKET_SIZE, data); + dev_dbg(&hdev->dev, "raw event data: [%*ph]\n", size, data); switch (up) { case GEN1_USAGE_PAGE: