| Message ID | 1286789218-13976-1-git-send-email-jslaby@suse.cz |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le lundi 11 octobre 2010 à 11:26 +0200, Jiri Slaby a écrit : > Stanse found that pch_gbe_xmit_frame uses skb after it is freed. Fix > that. > > Signed-off-by: Jiri Slaby <jslaby@suse.cz> > Cc: Masayuki Ohtake <masa-korg@dsn.okisemi.com> > --- > drivers/net/pch_gbe/pch_gbe_main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Applicable to net-next-2.6 only, this driver is not yet in Linus tree Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- 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
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 11 Oct 2010 11:38:38 +0200 > Le lundi 11 octobre 2010 à 11:26 +0200, Jiri Slaby a écrit : >> Stanse found that pch_gbe_xmit_frame uses skb after it is freed. Fix >> that. >> >> Signed-off-by: Jiri Slaby <jslaby@suse.cz> >> Cc: Masayuki Ohtake <masa-korg@dsn.okisemi.com> >> --- >> drivers/net/pch_gbe/pch_gbe_main.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) > > Applicable to net-next-2.6 only, this driver is not yet in Linus tree > > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> I'll apply this to net-next-2.6, thanks. -- 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
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index 53c56cf..e44644f 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c @@ -1847,9 +1847,9 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) unsigned long flags; if (unlikely(skb->len > (adapter->hw.mac.max_frame_size - 4))) { - dev_kfree_skb_any(skb); pr_err("Transfer length Error: skb len: %d > max: %d\n", skb->len, adapter->hw.mac.max_frame_size); + dev_kfree_skb_any(skb); adapter->stats.tx_length_errors++; return NETDEV_TX_OK; }
Stanse found that pch_gbe_xmit_frame uses skb after it is freed. Fix that. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Masayuki Ohtake <masa-korg@dsn.okisemi.com> --- drivers/net/pch_gbe/pch_gbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)