diff options
| author | Stephane Grosjean <s.grosjean@peak-system.com> | 2013-08-09 11:44:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 08:43:03 -0700 |
| commit | d00ff4f2e5340b4a1fae711c46d804500e4ad7f9 (patch) | |
| tree | 862dea6a80ce5863bdc71faed005f703c560cc0b /drivers/net/can | |
| parent | 775f521cd8ebf7edf47e88e6d1424513dc5e70e9 (diff) | |
| download | linux-3.10-d00ff4f2e5340b4a1fae711c46d804500e4ad7f9.tar.gz linux-3.10-d00ff4f2e5340b4a1fae711c46d804500e4ad7f9.tar.bz2 linux-3.10-d00ff4f2e5340b4a1fae711c46d804500e4ad7f9.zip | |
can: pcan_usb: fix wrong memcpy() bytes length
commit 3c322a56b01695df15c70bfdc2d02e0ccd80654e upstream.
Fix possibly wrong memcpy() bytes length since some CAN records received from
PCAN-USB could define a DLC field in range [9..15].
In that case, the real DLC value MUST be used to move forward the record pointer
but, only 8 bytes max. MUST be copied into the data field of the struct
can_frame object of the skb given to the network core.
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/peak_usb/pcan_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c index 25723d8ee20..925ab8ec932 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb.c @@ -649,7 +649,7 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len) if ((mc->ptr + rec_len) > mc->end) goto decode_failed; - memcpy(cf->data, mc->ptr, rec_len); + memcpy(cf->data, mc->ptr, cf->can_dlc); mc->ptr += rec_len; } |