netdev - Re: [PATCH net-next 1/3] can: mscan: fix improper return if dlc < 8 in start

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4B3F677D.4050804@grandegger.com>
Date:	Sat, 02 Jan 2010 16:34:21 +0100
From:	Wolfgang Grandegger <wg@...ndegger.com>
To:	Wolfram Sang <w.sang@...gutronix.de>
CC:	Socketcan-core@...ts.berlios.de, Netdev@...r.kernel.org,
	Devicetree-discuss@...ts.ozlabs.org, Linuxppc-dev@...ts.ozlabs.org,
	Wolfgang Grandegger <wg@...x.de>
Subject: Re: [PATCH net-next 1/3] can: mscan: fix improper return if dlc <
 8 in start_xmit function

Wolfram Sang wrote:
> On Sat, Jan 02, 2010 at 09:17:52AM +0100, Wolfgang Grandegger wrote:
>> From: Wolfgang Grandegger <wg@...x.de>
>>
>> The start_xmit function of the MSCAN Driver did return improperly if
>> the CAN dlc check failed (skb not freed and invalid return code). This
>> patch adds a proper check of the frame lenght and data size and returns
>> now correctly. Furthermore, a typo has been fixed.
> 
> A few little things, but in general:
> 
> Acked-by: Wolfram Sang <w.sang@...gutronix.de>
> 
>> Signed-off-by: Wolfgang Grandegger <wg@...x.de>
>> ---
>>  drivers/net/can/mscan/mscan.c |   11 ++++++++---
>>  1 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
>> index 07346f8..abdf5e8 100644
>> --- a/drivers/net/can/mscan/mscan.c
>> +++ b/drivers/net/can/mscan/mscan.c
>> @@ -4,7 +4,7 @@
>>   * Copyright (C) 2005-2006 Andrey Volkov <avolkov@...ma-el.com>,
>>   *                         Varma Electronics Oy
>>   * Copyright (C) 2008-2009 Wolfgang Grandegger <wg@...ndegger.com>
>> - * Copytight (C) 2008-2009 Pengutronix <kernel@...gutronix.de>
>> + * Copyright (C) 2008-2009 Pengutronix <kernel@...gutronix.de>
>>   *
>>   * This program is free software; you can redistribute it and/or modify
>>   * it under the terms of the version 2 of the GNU General Public License
>> @@ -177,8 +177,13 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
>>  	int i, rtr, buf_id;
>>  	u32 can_id;
>>  
>> -	if (frame->can_dlc > 8)
>> -		return -EINVAL;
>> +	if (skb->len != sizeof(*frame) || frame->can_dlc > 8) {
>> +		dev_err(dev->dev.parent,
>> +			"Dropping non-conform paket: len %d, can_dlc %d\n",
> 
> s/paket/packet/
> 
>> +			skb->len, frame->can_dlc);
> 
> Also, shouldn't it rather be %u (sk_buff->len is unsigned int)?

Will fix both issue.

Wolfgang.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html