netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] can: sja1000: fix bug using library functions for skb allocation
@ 2009-10-26 15:46 Wolfgang Grandegger
  2009-10-27  0:34 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Wolfgang Grandegger @ 2009-10-26 15:46 UTC (permalink / raw)
  To: Linux Netdev List; +Cc: Socketcan-core@lists.berlios.de, Kurt Van Dijck

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 <kurt.van.dijck@eia.be>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
 drivers/net/can/sja1000/sja1000.c |    2 --
 1 file changed, 2 deletions(-)

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++)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] can: sja1000: fix bug using library functions for skb allocation
  2009-10-26 15:46 [PATCH] can: sja1000: fix bug using library functions for skb allocation Wolfgang Grandegger
@ 2009-10-27  0:34 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-10-27  0:34 UTC (permalink / raw)
  To: wg; +Cc: netdev, Socketcan-core, kurt.van.dijck

From: Wolfgang Grandegger <wg@grandegger.com>
Date: Mon, 26 Oct 2009 16:46:12 +0100

> 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 <kurt.van.dijck@eia.be>
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-10-27  0:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-26 15:46 [PATCH] can: sja1000: fix bug using library functions for skb allocation Wolfgang Grandegger
2009-10-27  0:34 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).