Message ID | 1376041446-24058-2-git-send-email-mkl@pengutronix.de |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Fri, 9 Aug 2013 11:44:06 +0200 > From: Stephane Grosjean <s.grosjean@peak-system.com> > > 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. > > Cc: linux-stable <stable@vger.kernel.org> > Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c index 25723d8..925ab8e 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; }