Patch "net: cdc_ncm: GetNtbFormat endian fix" has been added to the 4.13-stable tree
This is a note to let you know that I've just added the patch titled
net: cdc_ncm: GetNtbFormat endian fix
to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-cdc_ncm-getntbformat-endian-fix.patch
and it can be found in the queue-4.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Nov 21 13:07:20 CET 2017
From: Bj�rn Mork <[email protected]>
Date: Wed, 15 Nov 2017 09:35:02 +0100
Subject: net: cdc_ncm: GetNtbFormat endian fix
From: Bj�rn Mork <[email protected]>
[ Upstream commit 6314dab4b8fb8493d810e175cb340376052c69b6 ]
The GetNtbFormat and SetNtbFormat requests operate on 16 bit little endian values. We get away with ignoring this most of the time, because we only care about USB_CDC_NCM_NTB16_FORMAT which is 0x0000. This fails for USB_CDC_NCM_NTB32_FORMAT.
Fix comparison between LE value from device and constant by converting the constant to LE.
--- drivers/net/usb/cdc_ncm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/usb/cdc_ncm.c +2 -2
@@ -771,7 +771,7 @@ int cdc_ncm_bind_common(struct usbnet *dint err;u8 iface_no;struct usb_cdc_parsed_header hdr; -u16 curr_ntb_format; +__le16 curr_ntb_format; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)
@@ -889,7 +889,7 @@ int cdc_ncm_bind_common(struct usbnet *d goto error2; } -if (curr_ntb_format ==USB_CDC_NCM_NTB32_FORMAT ) { +if (curr_ntb_format ==cpu_to_le16 (USB_CDC_NCM_NTB32_FORMAT )) {dev_info (&intf->dev,"resetting NTB format to 16-bit" ); err =usbnet_write_cmd (dev,USB_CDC_SET_NTB_FORMAT , USB_TYPE_CLASS | USB_DIR_OUT
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/net-cdc_ether-fix-divide-by-0-on-bad-descriptors.patch queue-4.13/qmi_wwan-add-missing-skb_reset_mac_header-call.patch queue-4.13/net-qmi_wwan-fix-divide-by-0-on-bad-descriptors.patch queue-4.13/net-cdc_ncm-getntbformat-endian-fix.patch