From: James Chapman <jchapman@katalix.com>
To: netdev@vger.kernel.org
Cc: herbert@gondor.apana.org.au, davem@davemloft.net,
mostrows@speakeasy.net, paulus@samba.org
Subject: [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes
Date: Tue, 18 Sep 2007 22:44:33 +0100 [thread overview]
Message-ID: <200709182144.l8ILiXrx008249@quickie.katalix.com> (raw)
[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;
}
/*****************************************************************************
next reply other threads:[~2007-09-18 21:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 21:44 James Chapman [this message]
2007-09-18 21:51 ` [PATCH net-2.6.24] [L2TP] Fix lockup introduced by recent changes David Miller
2007-09-19 1:37 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200709182144.l8ILiXrx008249@quickie.katalix.com \
--to=jchapman@katalix.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=mostrows@speakeasy.net \
--cc=netdev@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox