diff options
| author |   Maximilian Schneider <max@schneidersoft.net> | 2013-07-02 23:43:29 +0000 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2013-07-19 14:55:13 +0200 |
| commit | 233a26e85f9a72bcd0cdb7a95d1d5abcd052369f (patch) | |
| tree | 56048ef7b8a0ccac8fac41542259d107d0cc1e2e /drivers/net/can/usb/esd_usb2.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-233a26e85f9a72bcd0cdb7a95d1d5abcd052369f.tar.xz linux-dev-233a26e85f9a72bcd0cdb7a95d1d5abcd052369f.zip | |
net: can: esd_usb2: check index of array before accessing
The esd_usb2_read_bulk_callback() function is parsing the data that comes from
the USB CAN adapter. One datum is used as an index to access the dev->nets[]
array. This patch adds the missing bounds checking.
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Maximilian Schneider <max@schneidersoft.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/usb/esd_usb2.c')
| -rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 6aa7b3266c80..ac6177d3befc 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -412,10 +412,20 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) switch (msg->msg.hdr.cmd) { case CMD_CAN_RX: + if (msg->msg.rx.net >= dev->net_count) { + dev_err(dev->udev->dev.parent, "format error\n"); + break; + } + esd_usb2_rx_can_msg(dev->nets[msg->msg.rx.net], msg); break; case CMD_CAN_TX: + if (msg->msg.txdone.net >= dev->net_count) { + dev_err(dev->udev->dev.parent, "format error\n"); + break; + } + esd_usb2_tx_done_msg(dev->nets[msg->msg.txdone.net], msg); break; |