diff for duplicates of <20091019205740.GD5233@lenovo> diff --git a/a/1.txt b/N1/1.txt index 7fea409..ff4fc66 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,8 @@ Anyway -- this patch is ugly enough but may happen to work. 1 file changed, 62 insertions(+), 17 deletions(-) Index: linux-2.6.git/drivers/net/pppoe.c -==================================--- linux-2.6.git.orig/drivers/net/pppoe.c +===================================================================== +--- linux-2.6.git.orig/drivers/net/pppoe.c +++ linux-2.6.git/drivers/net/pppoe.c @@ -386,14 +386,19 @@ static struct notifier_block pppoe_notif static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb) @@ -45,7 +46,7 @@ Index: linux-2.6.git/drivers/net/pppoe.c } else if (sk->sk_state & PPPOX_RELAY) { - relay_po = get_item_by_addr(dev_net(po->pppoe_dev), - &po->pppoe_relay); -- if (relay_po = NULL) +- if (relay_po == NULL) + spin_lock(&flush_lock); + if (po->pppoe_dev) + net = dev_net(po->pppoe_dev); @@ -55,7 +56,7 @@ Index: linux-2.6.git/drivers/net/pppoe.c + if (!net || !relay_po) goto abort_kfree; - if ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) = 0) + if ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) == 0) @@ -652,12 +657,15 @@ static int pppoe_connect(struct socket * /* Delete the old binding */ if (stage_session(po->pppoe_pa.sid)) { diff --git a/a/content_digest b/N1/content_digest index 9a8c271..9ee509d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,8 +8,8 @@ "ref\0e6d1cecd0910191107h899a4ffs588f2413093dfb4b@mail.gmail.com\0" "ref\04ADCB3A4.8060408@gmail.com\0" "From\0Cyrill Gorcunov <gorcunov@gmail.com>\0" - "Subject\0Re: kernel panic in latest vanilla stable, while using nameif with\0" - "Date\0Mon, 19 Oct 2009 20:57:40 +0000\0" + "Subject\0Re: kernel panic in latest vanilla stable, while using nameif with \"alive\" pppoe interfaces\0" + "Date\0Tue, 20 Oct 2009 00:57:40 +0400\0" "To\0Eric Dumazet <eric.dumazet@gmail.com>\0" "Cc\0Michal Ostrowski <mostrows@gmail.com>" Denys Fedoryschenko <denys@visp.net.lb> @@ -51,7 +51,8 @@ " 1 file changed, 62 insertions(+), 17 deletions(-)\n" "\n" "Index: linux-2.6.git/drivers/net/pppoe.c\n" - "==================================--- linux-2.6.git.orig/drivers/net/pppoe.c\n" + "=====================================================================\n" + "--- linux-2.6.git.orig/drivers/net/pppoe.c\n" "+++ linux-2.6.git/drivers/net/pppoe.c\n" "@@ -386,14 +386,19 @@ static struct notifier_block pppoe_notif\n" " static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb)\n" @@ -66,7 +67,7 @@ " \t} else if (sk->sk_state & PPPOX_RELAY) {\n" "-\t\trelay_po = get_item_by_addr(dev_net(po->pppoe_dev),\n" "-\t\t\t\t\t\t&po->pppoe_relay);\n" - "-\t\tif (relay_po = NULL)\n" + "-\t\tif (relay_po == NULL)\n" "+\t\tspin_lock(&flush_lock);\n" "+\t\tif (po->pppoe_dev)\n" "+\t\t\tnet = dev_net(po->pppoe_dev);\n" @@ -76,7 +77,7 @@ "+\t\tif (!net || !relay_po)\n" " \t\t\tgoto abort_kfree;\n" " \n" - " \t\tif ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) = 0)\n" + " \t\tif ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) == 0)\n" "@@ -652,12 +657,15 @@ static int pppoe_connect(struct socket *\n" " \t/* Delete the old binding */\n" " \tif (stage_session(po->pppoe_pa.sid)) {\n" @@ -248,4 +249,4 @@ " \tkfree_skb(skb);\n" " \treturn 1;" -9b90b46b80d4baf790b4bec2bb459e2e463d3ab8c8719575b7363d6654f26543 +d185a513c9c0d5360d407c308caa1fec4245f9896dd673455b226d2ece7c8cdb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.