From patchwork Sat Jan 2 08:17:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 42010 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id EE1FF100E31 for ; Sat, 2 Jan 2010 19:18:25 +1100 (EST) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by ozlabs.org (Postfix) with ESMTP id DF07F1007D3; Sat, 2 Jan 2010 19:18:00 +1100 (EST) Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id DC85B1C001C1; Sat, 2 Jan 2010 09:17:55 +0100 (CET) X-Auth-Info: WGTzcGN1kUq8e+1Yz+Xxi9OXZiwdtlQ80nlCzzByiLU= Received: from mail.denx.de (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by smtp-auth.mnet-online.de (Postfix) with ESMTP id CFD82901F0; Sat, 2 Jan 2010 09:17:55 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail.denx.de (Postfix) with ESMTP id 4DB8F41D62B6; Sat, 2 Jan 2010 09:17:55 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 504) id B62411012361A; Sat, 2 Jan 2010 09:17:54 +0100 (CET) From: Wolfgang Grandegger To: Netdev@vger.kernel.org Subject: [PATCH net-next 1/3] can: mscan: fix improper return if dlc < 8 in start_xmit function Date: Sat, 2 Jan 2010 09:17:52 +0100 Message-Id: <1262420274-16586-2-git-send-email-wg@grandegger.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1262420274-16586-1-git-send-email-wg@grandegger.com> References: <1262420274-16586-1-git-send-email-wg@grandegger.com> Cc: Socketcan-core@lists.berlios.de, Devicetree-discuss@lists.ozlabs.org, Linuxppc-dev@lists.ozlabs.org, Wolfgang Grandegger X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Wolfgang Grandegger 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. Signed-off-by: Wolfgang Grandegger Acked-by: Wolfram Sang --- 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 , * Varma Electronics Oy * Copyright (C) 2008-2009 Wolfgang Grandegger - * Copytight (C) 2008-2009 Pengutronix + * Copyright (C) 2008-2009 Pengutronix * * 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", + skb->len, frame->can_dlc); + kfree_skb(skb); + return NETDEV_TX_OK; + } out_8(®s->cantier, 0);