CDC-NCM: handle incomplete transfer of MTU
PATCH v2 1/1 CDC-NCM: handle incomplete transfer of MTU
A malicious device may give half an answer when asked for its MTU. The driver will proceed after this with a garbage MTU. Anything but a complete answer must be treated as an error.
V2: used sizeof as request by Alexander
--- drivers/net/usb/cdc_ncm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/usb/cdc_ncm.c +3 -3
@@ -578,8 +578,8 @@ static void cdc_ncm_set_dgram_size(struct usbnet *dev, int new_size)/* read current mtu value from device */ err =usbnet_read_cmd (dev,USB_CDC_GET_MAX_DATAGRAM_SIZE ,USB_TYPE_CLASS |USB_DIR_IN |USB_RECIP_INTERFACE , -0 , iface_no, &max_datagram_size,2 ); -if (err <0 ) { +0 , iface_no, &max_datagram_size,sizeof (max_datagram_size)); +if (err <sizeof (max_datagram_size)) {dev_dbg (&dev->intf->dev,"GET_MAX_DATAGRAM_SIZE failed\n" ); goto out; }
@@ -590,7 +590,7 @@ static void cdc_ncm_set_dgram_size(struct usbnet *dev, int new_size) max_datagram_size =cpu_to_le16 (ctx->max_datagram_size); err =usbnet_write_cmd (dev,USB_CDC_SET_MAX_DATAGRAM_SIZE ,USB_TYPE_CLASS |USB_DIR_OUT |USB_RECIP_INTERFACE , -0 , iface_no, &max_datagram_size,2 ); +0 , iface_no, &max_datagram_size,sizeof (max_datagram_size));if (err <0 )dev_dbg (&dev->intf->dev,"SET_MAX_DATAGRAM_SIZE failed\n" );
Signature · 1 line
2.16.4
PATCH 1/1 CDC-NCM: handle incomplete transfer of MTU
A malicious device may give half an answer when asked for its MTU. The driver will proceed after this with a garbage MTU. Anything but a complete answer must be treated as an error.
V2: used sizeof as request by Alexander
--- drivers/net/usb/cdc_ncm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/usb/cdc_ncm.c +3 -3
@@ -578,8 +578,8 @@ static void cdc_ncm_set_dgram_size(struct usbnet *dev, int new_size)/* read current mtu value from device */ err =usbnet_read_cmd (dev,USB_CDC_GET_MAX_DATAGRAM_SIZE ,USB_TYPE_CLASS |USB_DIR_IN |USB_RECIP_INTERFACE , -0 , iface_no, &max_datagram_size,2 ); -if (err <0 ) { +0 , iface_no, &max_datagram_size,sizeof (max_datagram_size)); +if (err <sizeof (max_datagram_size)) {dev_dbg (&dev->intf->dev,"GET_MAX_DATAGRAM_SIZE failed\n" ); goto out; }
@@ -590,7 +590,7 @@ static void cdc_ncm_set_dgram_size(struct usbnet *dev, int new_size) max_datagram_size =cpu_to_le16 (ctx->max_datagram_size); err =usbnet_write_cmd (dev,USB_CDC_SET_MAX_DATAGRAM_SIZE ,USB_TYPE_CLASS |USB_DIR_OUT |USB_RECIP_INTERFACE , -0 , iface_no, &max_datagram_size,2 ); +0 , iface_no, &max_datagram_size,sizeof (max_datagram_size));if (err <0 )dev_dbg (&dev->intf->dev,"SET_MAX_DATAGRAM_SIZE failed\n" );
Signature · 1 line
2.16.4
David Miller
maintainerFrom: Oliver Neukum <[email protected]>
Date: Thu, 7 Nov 2019 09:48:01 +0100
Quoted 9 lines
A malicious device may give half an answer when asked for its MTU. The driver will proceed after this with a garbage MTU. Anything but a complete answer must be treated as an error.
V2: used sizeof as request by Alexander
Reported-and-tested-by [email protected]Signed-off-by Oliver Neukum <[email protected]>
Applied and queued up for -stable, thanks.