This is a note to let you know that I've just added the patch titled
pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
to the 2.6.38-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pppoe-drop-pppox_zombies-in-pppoe_flush_dev.patch
and it can be found in the queue-2.6.38 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 1a3ea69b2cb514439d4a5f6cabac89a845204f1b Mon Sep 17 00:00:00 2001
From: Ulrich Weber <[email protected]>
Date: Wed, 6 Apr 2011 14:04:49 -0700
Subject: pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
From: Ulrich Weber <[email protected]>
[ Upstream commit ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66 ]
otherwise we loop forever if a PPPoE socket was set
to PPPOX_ZOMBIE state by a PADT message when the
ethernet device is going down afterwards.
Signed-off-by: Ulrich Weber <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/pppoe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -317,7 +317,7 @@ static void pppoe_flush_dev(struct net_d
lock_sock(sk);
if (po->pppoe_dev == dev &&
- sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
+ sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND |
PPPOX_ZOMBIE)) {
pppox_unbind_sock(sk);
sk->sk_state = PPPOX_ZOMBIE;
sk->sk_state_change(sk);
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.38/pppoe-drop-pppox_zombies-in-pppoe_flush_dev.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
