[PATCH] pcan_usb: fix wrong memcpy() bytes length

[PATCH] pcan_usb: fix wrong memcpy() bytes length

[Stephane Grosjean]

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>
---
 drivers/net/can/usb/peak_usb/pcan_usb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 	}
 
-- 
1.7.10.4

Re: [PATCH] pcan_usb: fix wrong memcpy() bytes length

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 807 bytes --]

On 08/08/2013 10:52 AM, Stephane Grosjean wrote:
> 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>

Looks like a candidate for stable, doesn't it?

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [PATCH] pcan_usb: fix wrong memcpy() bytes length

[Stephane Grosjean]

Hi Marc,

I'm afraid I don't understand your remark/question below. Can you please 
be more precise?

Regards,

Stéphane

Le 08/08/2013 11:56, Marc Kleine-Budde a écrit :
> On 08/08/2013 10:52 AM, Stephane Grosjean wrote:
>> 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>
> Looks like a candidate for stable, doesn't it?
>
> Marc
>

--
PEAK-System Technik GmbH, Otto-Roehm-Strasse 69, D-64293 Darmstadt 
Geschaeftsleitung: A.Gach/U.Wilhelm,St.Nr.:007/241/13586 FA Darmstadt 
HRB-9183 Darmstadt, Ust.IdNr.:DE 202220078, WEE-Reg.-Nr.: DE39305391 
Tel.+49 (0)6151-817320 / Fax:+49 (0)6151-817329, info@peak-system.com

Re: [PATCH] pcan_usb: fix wrong memcpy() bytes length

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 823 bytes --]

On 08/08/2013 03:45 PM, Stephane Grosjean wrote:
> I'm afraid I don't understand your remark/question below. Can you please
> be more precise?

Under Linux we have the concept of stable kernel [1] releases. As this
is a bugfix, I suggested that this patch should be scheduled for the
stable kernel procedure. This is done by adding a "Cc:
<stable@vger.kernel.org>" to the patch description.

I'll add the Cc and push the patch to David, okay :)

Marc

[1]
http://lxr.free-electrons.com/source/Documentation/stable_kernel_rules.txt

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [PATCH] pcan_usb: fix wrong memcpy() bytes length

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 924 bytes --]

On 08/08/2013 11:56 AM, Marc Kleine-Budde wrote:
> On 08/08/2013 10:52 AM, Stephane Grosjean wrote:
>> 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>
> 
> Looks like a candidate for stable, doesn't it?

Send pull request to David with stable on Cc.

tnx,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]