Skip to content

L
linux
Commit 36c35416 authored by Giuseppe Scrivano's avatar Giuseppe Scrivano Committed by David S. Miller
Browse files
Options

cdc_ncm: fix endianness problem. 

Fix a misusage of the struct usb_cdc_notification to pass arguments to the
usb_control_msg function.  The usb_control_msg function expects host endian
arguments but usb_cdc_notification stores these values as little endian.

Now usb_control_msg is directly invoked with host endian values.
Signed-off-by: default avatarGiuseppe Scrivano <giuseppe@southpole.se>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ee5a07c
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 100 deletions
drivers/net/usb/cdc_ncm.c
View file @ 36c35416
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <linux/usb/usbnet.h> #include <linux/usb/usbnet.h>
#include <linux/usb/cdc.h> #include <linux/usb/cdc.h>
#define DRIVER_VERSION "01-June-2011" #define DRIVER_VERSION "04-Aug-2011"
/* CDC NCM subclass 3.2.1 */ /* CDC NCM subclass 3.2.1 */
#define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10
...@@ -163,35 +163,8 @@ cdc_ncm_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) ...@@ -163,35 +163,8 @@ cdc_ncm_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info)); usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
} }
static int
cdc_ncm_do_request(struct cdc_ncm_ctx *ctx, struct usb_cdc_notification *req,
void *data, u16 flags, u16 *actlen, u16 timeout)
{
int err;
err = usb_control_msg(ctx->udev, (req->bmRequestType & USB_DIR_IN) ?
usb_rcvctrlpipe(ctx->udev, 0) :
usb_sndctrlpipe(ctx->udev, 0),
req->bNotificationType, req->bmRequestType,
req->wValue,
req->wIndex, data,
req->wLength, timeout);
if (err < 0) {
if (actlen)
*actlen = 0;
return err;
}
if (actlen)
*actlen = err;
return 0;
}
static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
{ {
struct usb_cdc_notification req;
u32 val; u32 val;
u8 flags; u8 flags;
u8 iface_no; u8 iface_no;
...@@ -200,14 +173,14 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) ...@@ -200,14 +173,14 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber; iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE; err = usb_control_msg(ctx->udev,
req.bNotificationType = USB_CDC_GET_NTB_PARAMETERS; usb_rcvctrlpipe(ctx->udev, 0),
req.wValue = 0; USB_CDC_GET_NTB_PARAMETERS,
req.wIndex = cpu_to_le16(iface_no); USB_TYPE_CLASS | USB_DIR_IN
req.wLength = cpu_to_le16(sizeof(ctx->ncm_parm)); | USB_RECIP_INTERFACE,
0, iface_no, &ctx->ncm_parm,
err = cdc_ncm_do_request(ctx, &req, &ctx->ncm_parm, 0, NULL, 1000); sizeof(ctx->ncm_parm), 10000);
if (err) { if (err < 0) {
pr_debug("failed GET_NTB_PARAMETERS\n"); pr_debug("failed GET_NTB_PARAMETERS\n");
return 1; return 1;
} }
...@@ -253,31 +226,26 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) ...@@ -253,31 +226,26 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
/* inform device about NTB input size changes */ /* inform device about NTB input size changes */
if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) { if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
USB_RECIP_INTERFACE;
req.bNotificationType = USB_CDC_SET_NTB_INPUT_SIZE;
req.wValue = 0;
req.wIndex = cpu_to_le16(iface_no);
if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) { if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
struct usb_cdc_ncm_ndp_input_size ndp_in_sz; struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
err = usb_control_msg(ctx->udev,
req.wLength = 8; usb_sndctrlpipe(ctx->udev, 0),
ndp_in_sz.dwNtbInMaxSize = cpu_to_le32(ctx->rx_max); USB_CDC_SET_NTB_INPUT_SIZE,
ndp_in_sz.wNtbInMaxDatagrams = USB_TYPE_CLASS | USB_DIR_OUT
cpu_to_le16(CDC_NCM_DPT_DATAGRAMS_MAX); | USB_RECIP_INTERFACE,
ndp_in_sz.wReserved = 0; 0, iface_no, &ndp_in_sz, 8, 1000);
err = cdc_ncm_do_request(ctx, &req, &ndp_in_sz, 0, NULL,
1000);
} else { } else {
__le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max); __le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
err = usb_control_msg(ctx->udev,
req.wLength = 4; usb_sndctrlpipe(ctx->udev, 0),
err = cdc_ncm_do_request(ctx, &req, &dwNtbInMaxSize, 0, USB_CDC_SET_NTB_INPUT_SIZE,
NULL, 1000); USB_TYPE_CLASS | USB_DIR_OUT
| USB_RECIP_INTERFACE,
0, iface_no, &dwNtbInMaxSize, 4, 1000);
} }
if (err) if (err < 0)
pr_debug("Setting NTB Input Size failed\n"); pr_debug("Setting NTB Input Size failed\n");
} }
...@@ -332,29 +300,24 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) ...@@ -332,29 +300,24 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
/* set CRC Mode */ /* set CRC Mode */
if (flags & USB_CDC_NCM_NCAP_CRC_MODE) { if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | err = usb_control_msg(ctx->udev, usb_sndctrlpipe(ctx->udev, 0),
USB_RECIP_INTERFACE; USB_CDC_SET_CRC_MODE,
req.bNotificationType = USB_CDC_SET_CRC_MODE; USB_TYPE_CLASS | USB_DIR_OUT
req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED); | USB_RECIP_INTERFACE,
req.wIndex = cpu_to_le16(iface_no); USB_CDC_NCM_CRC_NOT_APPENDED,
req.wLength = 0; iface_no, NULL, 0, 1000);
if (err < 0)
err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
if (err)
pr_debug("Setting CRC mode off failed\n"); pr_debug("Setting CRC mode off failed\n");
} }
/* set NTB format, if both formats are supported */ /* set NTB format, if both formats are supported */
if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) { if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | err = usb_control_msg(ctx->udev, usb_sndctrlpipe(ctx->udev, 0),
USB_RECIP_INTERFACE; USB_CDC_SET_NTB_FORMAT, USB_TYPE_CLASS
req.bNotificationType = USB_CDC_SET_NTB_FORMAT; | USB_DIR_OUT | USB_RECIP_INTERFACE,
req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT); USB_CDC_NCM_NTB16_FORMAT,
req.wIndex = cpu_to_le16(iface_no); iface_no, NULL, 0, 1000);
req.wLength = 0; if (err < 0)
err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
if (err)
pr_debug("Setting NTB format to 16-bit failed\n"); pr_debug("Setting NTB format to 16-bit failed\n");
} }
...@@ -364,17 +327,13 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) ...@@ -364,17 +327,13 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) { if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
__le16 max_datagram_size; __le16 max_datagram_size;
u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize); u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
err = usb_control_msg(ctx->udev, usb_rcvctrlpipe(ctx->udev, 0),
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN | USB_CDC_GET_MAX_DATAGRAM_SIZE,
USB_RECIP_INTERFACE; USB_TYPE_CLASS | USB_DIR_IN
req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE; | USB_RECIP_INTERFACE,
req.wValue = 0; 0, iface_no, &max_datagram_size,
req.wIndex = cpu_to_le16(iface_no); 2, 1000);
req.wLength = cpu_to_le16(2); if (err < 0) {
err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL,
1000);
if (err) {
pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n", pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
CDC_NCM_MIN_DATAGRAM_SIZE); CDC_NCM_MIN_DATAGRAM_SIZE);
} else { } else {
...@@ -395,17 +354,15 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) ...@@ -395,17 +354,15 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
CDC_NCM_MIN_DATAGRAM_SIZE; CDC_NCM_MIN_DATAGRAM_SIZE;
/* if value changed, update device */ /* if value changed, update device */
req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | err = usb_control_msg(ctx->udev,
USB_RECIP_INTERFACE; usb_sndctrlpipe(ctx->udev, 0),
req.bNotificationType = USB_CDC_SET_MAX_DATAGRAM_SIZE; USB_CDC_SET_MAX_DATAGRAM_SIZE,
req.wValue = 0; USB_TYPE_CLASS | USB_DIR_OUT
req.wIndex = cpu_to_le16(iface_no); | USB_RECIP_INTERFACE,
req.wLength = 2; 0,
max_datagram_size = cpu_to_le16(ctx->max_datagram_size); iface_no, &max_datagram_size,
2, 1000);
err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, if (err < 0)
0, NULL, 1000);
if (err)
pr_debug("SET_MAX_DATAGRAM_SIZE failed\n"); pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
} }
...@@ -671,7 +628,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb) ...@@ -671,7 +628,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
u32 rem; u32 rem;
u32 offset; u32 offset;
u32 last_offset; u32 last_offset;
u16 n = 0; u16 n = 0, index;
u8 ready2send = 0; u8 ready2send = 0;
/* if there is a remaining skb, it gets priority */ /* if there is a remaining skb, it gets priority */
...@@ -859,8 +816,8 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb) ...@@ -859,8 +816,8 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
cpu_to_le16(sizeof(ctx->tx_ncm.nth16)); cpu_to_le16(sizeof(ctx->tx_ncm.nth16));
ctx->tx_ncm.nth16.wSequence = cpu_to_le16(ctx->tx_seq); ctx->tx_ncm.nth16.wSequence = cpu_to_le16(ctx->tx_seq);
ctx->tx_ncm.nth16.wBlockLength = cpu_to_le16(last_offset); ctx->tx_ncm.nth16.wBlockLength = cpu_to_le16(last_offset);
ctx->tx_ncm.nth16.wNdpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16), index = ALIGN(sizeof(struct usb_cdc_ncm_nth16), ctx->tx_ndp_modulus);
ctx->tx_ndp_modulus); ctx->tx_ncm.nth16.wNdpIndex = cpu_to_le16(index);
memcpy(skb_out->data, &(ctx->tx_ncm.nth16), sizeof(ctx->tx_ncm.nth16)); memcpy(skb_out->data, &(ctx->tx_ncm.nth16), sizeof(ctx->tx_ncm.nth16));
ctx->tx_seq++; ctx->tx_seq++;
...@@ -873,12 +830,11 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb) ...@@ -873,12 +830,11 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
ctx->tx_ncm.ndp16.wLength = cpu_to_le16(rem); ctx->tx_ncm.ndp16.wLength = cpu_to_le16(rem);
ctx->tx_ncm.ndp16.wNextNdpIndex = 0; /* reserved */ ctx->tx_ncm.ndp16.wNextNdpIndex = 0; /* reserved */
memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex, memcpy(((u8 *)skb_out->data) + index,
&(ctx->tx_ncm.ndp16), &(ctx->tx_ncm.ndp16),
sizeof(ctx->tx_ncm.ndp16)); sizeof(ctx->tx_ncm.ndp16));
memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex + memcpy(((u8 *)skb_out->data) + index + sizeof(ctx->tx_ncm.ndp16),
sizeof(ctx->tx_ncm.ndp16),
&(ctx->tx_ncm.dpe16), &(ctx->tx_ncm.dpe16),
(ctx->tx_curr_frame_num + 1) * (ctx->tx_curr_frame_num + 1) *
sizeof(struct usb_cdc_ncm_dpe16)); sizeof(struct usb_cdc_ncm_dpe16));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7