projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fccd613
)
USB: CDC: fix sanity checks in CDC union parser
author
Oliver Neukum
<oneukum@suse.com>
Tue, 13 Aug 2019 09:35:41 +0000
(11:35 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 25 Aug 2019 08:51:49 +0000
(10:51 +0200)
commit
54364278fb3cabdea51d6398b07c87415065b3fc
upstream.
A few checks checked for the size of the pointer to a structure
instead of the structure itself. Copy & paste issue presumably.
Fixes:
e4c6fb7794982
("usbnet: move the CDC parser into USB core")
Cc: stable <stable@vger.kernel.org>
Reported-by: syzbot+45a53506b65321c1fe91@syzkaller.appspotmail.com
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link:
https://lore.kernel.org/r/20190813093541.18889-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/message.c
patch
|
blob
|
history
diff --git
a/drivers/usb/core/message.c
b/drivers/usb/core/message.c
index
955cd65
..
d6075d4
100644
(file)
--- a/
drivers/usb/core/message.c
+++ b/
drivers/usb/core/message.c
@@
-2142,14
+2142,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;