From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46F521DF972; Wed, 19 Feb 2025 09:27:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739957264; cv=none; b=AYlrYH/J8Au4EFfSdIc6LbjrWF8+gZrfOkBqPxAX14QYU8ovNA8peh77chMpiM0JZEdgm8Xq+5So7jzBjcqSAbymrBS+L4/t36ggy+e92F/axUBwbnws1vm1DP3G1tpl8NZA03yNzfdF+wdxp5ZYbGP/XdtfpQ3oA1GkniCbJig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739957264; c=relaxed/simple; bh=aqFyB26s9dpCnvlBjEg5yDhO3GdnUHM3jmCKPCI8StQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sEvRYRfV9ZFTyTK4NmGbxNLJCI8x85OPVeHdrXiH6JYQWh9pwT9b9kCJnETFDx8PTc8YIVfuo+L9r7C+FN3LxIvMquvKoLPdErB4yz2aUgPWij0ksLjNF2ruXAUvjAv2UwQm3akU905DeL+YvkCOC1jNFNGQ+5mTMWnjJLbzMp4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cVQ1W+2v; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cVQ1W+2v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 653DCC4CED1; Wed, 19 Feb 2025 09:27:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739957263; bh=aqFyB26s9dpCnvlBjEg5yDhO3GdnUHM3jmCKPCI8StQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVQ1W+2v3Aue+rb9uNXY6PAOlPmsDovB/jQlcCsAgfEvAVMErtWXL4RViKHeI7MQM Y56luC+KdPJtfdsqZTGqQEP80dWSAInaUZZf6jPTZ38xfDSvtbG/7E5RfiQc0JDVai 0HakWWXmKa8XBzGomtYhoulwE5PmUGJHQkh5+QM8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+9c9179ac46169c56c1ad@syzkaller.appspotmail.com, =?UTF-8?q?T=C3=BAlio=20Fernandes?= , Jiri Kosina , Sasha Levin Subject: [PATCH 6.1 466/578] HID: hid-thrustmaster: fix stack-out-of-bounds read in usb_check_int_endpoints() Date: Wed, 19 Feb 2025 09:27:50 +0100 Message-ID: <20250219082711.339826688@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tulio Fernandes [ Upstream commit 0b43d98ff29be3144e86294486b1373b5df74c0e ] Syzbot[1] has detected a stack-out-of-bounds read of the ep_addr array from hid-thrustmaster driver. This array is passed to usb_check_int_endpoints function from usb.c core driver, which executes a for loop that iterates over the elements of the passed array. Not finding a null element at the end of the array, it tries to read the next, non-existent element, crashing the kernel. To fix this, a 0 element was added at the end of the array to break the for loop. [1] https://syzkaller.appspot.com/bug?extid=9c9179ac46169c56c1ad Reported-by: syzbot+9c9179ac46169c56c1ad@syzkaller.appspotmail.com Fixes: 50420d7c79c3 ("HID: hid-thrustmaster: Fix warning in thrustmaster_probe by adding endpoint check") Signed-off-by: Túlio Fernandes Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-thrustmaster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-thrustmaster.c b/drivers/hid/hid-thrustmaster.c index 6c3e758bbb09e..3b81468a1df29 100644 --- a/drivers/hid/hid-thrustmaster.c +++ b/drivers/hid/hid-thrustmaster.c @@ -171,7 +171,7 @@ static void thrustmaster_interrupts(struct hid_device *hdev) b_ep = ep->desc.bEndpointAddress; /* Are the expected endpoints present? */ - u8 ep_addr[1] = {b_ep}; + u8 ep_addr[2] = {b_ep, 0}; if (!usb_check_int_endpoints(usbif, ep_addr)) { hid_err(hdev, "Unexpected non-int endpoint\n"); -- 2.39.5