Commit 48af3ce0 authored Sep 21, 2017 by Greg Kroah-Hartman Committed by Srinivasa Rao Kuppala Apr 24, 2018

USB: core: harden cdc_parse_cdc_header



Andrey Konovalov reported a possible out-of-bounds problem for the
cdc_parse_cdc_header function.  He writes:
	It looks like cdc_parse_cdc_header() doesn't validate buflen
	before accessing buffer[1], buffer[2] and so on. The only check
	present is while (buflen > 0).

So fix this issue up by properly validating the buffer length matches
what the descriptor says it is.

Change-Id: I9c65dc98778aa357911e554c8d28deef2bf9a5b3
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 2e1c42391ff2556387b3cb6308b24f6f65619feb
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>

parent 185ffc9c

drivers/usb/core/message.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2070,6 +2070,10 @@ int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
		elength = 1;
		goto next_desc;
		}
		if ((buflen < elength) \|\| (elength < 3)) {
		dev_err(&intf->dev, "invalid descriptor buffer length\n");
		break;
		}
		if (buffer[1] != USB_DT_CS_INTERFACE) {
		dev_err(&intf->dev, "skipping garbage\n");
		goto next_desc;