From patchwork Thu Jan 7 14:10:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 42434 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 67C39B7BF2 for ; Fri, 8 Jan 2010 01:10:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809Ab0AGOKb (ORCPT ); Thu, 7 Jan 2010 09:10:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752725Ab0AGOKa (ORCPT ); Thu, 7 Jan 2010 09:10:30 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:53453 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752450Ab0AGOK1 (ORCPT ); Thu, 7 Jan 2010 09:10:27 -0500 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 9DC961C157CF; Thu, 7 Jan 2010 15:10:22 +0100 (CET) X-Auth-Info: Mef1/d6jmHNJSxKBuIUDTsNdE3qkAEW1rrQsd4df0Hw= 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 7A22790209; Thu, 7 Jan 2010 15:10:22 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail.denx.de (Postfix) with ESMTP id 3AB7E4234F9A; Thu, 7 Jan 2010 15:10:22 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 504) id F21A71012361A; Thu, 7 Jan 2010 15:10:21 +0100 (CET) From: Wolfgang Grandegger To: Netdev@vger.kernel.org Cc: Socketcan-core@lists.berlios.de, Linuxppc-dev@lists.ozlabs.org, Devicetree-discuss@lists.ozlabs.org, Wolfram Sang , Wolfgang Grandegger Subject: [PATCH net-next v3 1/3] can: mscan: fix improper return if dlc < 8 in start_xmit function Date: Thu, 7 Jan 2010 15:10:19 +0100 Message-Id: <1262873421-6863-2-git-send-email-wg@grandegger.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1262873421-6863-1-git-send-email-wg@grandegger.com> References: <1262873421-6863-1-git-send-email-wg@grandegger.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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 Reviewed-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..955a164 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 packet: len %u, can_dlc %u\n", + skb->len, frame->can_dlc); + kfree_skb(skb); + return NETDEV_TX_OK; + } out_8(®s->cantier, 0);