From patchwork Mon Oct 26 15:46:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 36926 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 8ACADB7BEB for ; Tue, 27 Oct 2009 02:46:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999AbZJZPqr (ORCPT ); Mon, 26 Oct 2009 11:46:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752987AbZJZPqr (ORCPT ); Mon, 26 Oct 2009 11:46:47 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52572 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752977AbZJZPqr (ORCPT ); Mon, 26 Oct 2009 11:46:47 -0400 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 8B9861C15504; Mon, 26 Oct 2009 16:46:50 +0100 (CET) X-Auth-Info: gRZqM/sJrcjcQMU9bzozbvn5yNXB7bjz13EAWx4zj/o= Received: from lancy.mylan.de (p4FE655EA.dip.t-dialin.net [79.230.85.234]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-auth.mnet-online.de (Postfix) with ESMTP id 269CF9018D; Mon, 26 Oct 2009 16:46:50 +0100 (CET) Message-ID: <4AE5C444.9030804@grandegger.com> Date: Mon, 26 Oct 2009 16:46:12 +0100 From: Wolfgang Grandegger User-Agent: Thunderbird 2.0.0.23 (X11/20090812) MIME-Version: 1.0 To: Linux Netdev List CC: "Socketcan-core@lists.berlios.de" , Kurt Van Dijck Subject: [PATCH] can: sja1000: fix bug using library functions for skb allocation X-Enigmail-Version: 0.96.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 7b6856a0 "can: provide library functions for skb allocation" did not properly remove two lines of the SJA1000 driver resulting in a 'skb_over_panic' when calling skb_put, as reported by Kurt. Signed-off-by: Kurt Van Dijck Signed-off-by: Wolfgang Grandegger --- drivers/net/can/sja1000/sja1000.c | 2 -- 1 file changed, 2 deletions(-) -- 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 Index: net-next-2.6/drivers/net/can/sja1000/sja1000.c =================================================================== --- net-next-2.6.orig/drivers/net/can/sja1000/sja1000.c +++ net-next-2.6/drivers/net/can/sja1000/sja1000.c @@ -321,8 +321,6 @@ static void sja1000_rx(struct net_device if (fi & FI_RTR) id |= CAN_RTR_FLAG; - cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame)); - memset(cf, 0, sizeof(struct can_frame)); cf->can_id = id; cf->can_dlc = dlc; for (i = 0; i < dlc; i++)