* [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes
@ 2007-09-18 21:44 James Chapman
2007-09-18 21:51 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: James Chapman @ 2007-09-18 21:44 UTC (permalink / raw)
To: netdev; +Cc: herbert, davem, mostrows, paulus
[L2TP] Fix double skb free problem introduced by recent changes
This patch is to be applied on top of Herbert's recent patch set:
"[PPP 3/3] L2TP: Fix skb handling in pppol2tp_xmit"
It fixes a double kfree_skb() issue introduced by that patch. Also
return 0 on error, allowing PPP to requeue the skb.
Signed-off-by: James Chapman <jchapman@katalix.com>
Index: net-2.6.24/drivers/net/pppol2tp.c
===================================================================
--- net-2.6.24.orig/drivers/net/pppol2tp.c
+++ net-2.6.24/drivers/net/pppol2tp.c
@@ -1066,11 +1066,10 @@ static int pppol2tp_xmit(struct ppp_chan
session->stats.tx_errors++;
}
- /* Free the original skb */
-abort:
- kfree_skb(skb);
-
return 1;
+
+abort:
+ return 0;
}
/*****************************************************************************
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes
2007-09-18 21:44 [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes James Chapman
@ 2007-09-18 21:51 ` David Miller
2007-09-19 1:37 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2007-09-18 21:51 UTC (permalink / raw)
To: jchapman; +Cc: netdev, herbert, mostrows, paulus
From: James Chapman <jchapman@katalix.com>
Date: Tue, 18 Sep 2007 22:44:33 +0100
> [L2TP] Fix double skb free problem introduced by recent changes
>
> This patch is to be applied on top of Herbert's recent patch set:
> "[PPP 3/3] L2TP: Fix skb handling in pppol2tp_xmit"
>
> It fixes a double kfree_skb() issue introduced by that patch. Also
> return 0 on error, allowing PPP to requeue the skb.
>
> Signed-off-by: James Chapman <jchapman@katalix.com>
Thanks James. I've applied this to net-2.6
Herbert, please take a quick look, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes
2007-09-18 21:51 ` David Miller
@ 2007-09-19 1:37 ` Herbert Xu
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2007-09-19 1:37 UTC (permalink / raw)
To: David Miller; +Cc: jchapman, netdev, mostrows, paulus
On Tue, Sep 18, 2007 at 02:51:06PM -0700, David Miller wrote:
>
> Herbert, please take a quick look, thanks.
Yep it looks good. I should've read my emails from the
bottom up :)
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-09-19 1:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-18 21:44 [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes James Chapman
2007-09-18 21:51 ` David Miller
2007-09-19 1:37 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox