patch "USB: CDC: fix sanity checks in CDC union parser" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
USB: CDC: fix sanity checks in CDC union parser
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 54364278fb3cabdea51d6398b07c87415065b3fc Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Tue, 13 Aug 2019 11:35:41 +0200
Subject: USB: CDC: fix sanity checks in CDC union parser
A few checks checked for the size of the pointer to a structure instead of the structure itself. Copy & paste issue presumably.
--- drivers/usb/core/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/core/message.c +2 -2
@@ -2218,14 +2218,14 @@ int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr, (struct usb_cdc_dmm_desc *)buffer;break ;case USB_CDC_MDLM_TYPE : -if (elength <sizeof (struct usb_cdc_mdlm_desc *)) +if (elength <sizeof (struct usb_cdc_mdlm_desc )) goto next_desc;if (desc)return -EINVAL ; desc = (struct usb_cdc_mdlm_desc *)buffer;break ;case USB_CDC_MDLM_DETAIL_TYPE : -if (elength <sizeof (struct usb_cdc_mdlm_detail_desc *)) +if (elength <sizeof (struct usb_cdc_mdlm_detail_desc )) goto next_desc;if (detail)return -EINVAL ;
Signature · 1 line
2.22.1