2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------ From: Andrej Ota <[email protected]> [ Upstream commit 2a27a03d3a891e87ca33d27a858b4db734a4cbab ] __pppoe_xmit function return value was invalid resulting in additional call to kfree_skb on already freed skb. This resulted in memory corruption and consequent kernel panic after PPPoE peer terminated the link. This fixes commit 55c95e738da85373965cb03b4f975d0fd559865b. Reported-by: Gorik Van Steenberge <[email protected]> Reported-by: Daniel Kenzelmann <[email protected]> Reported-by: Denys Fedoryshchenko <[email protected]> Reported-by: Pawel Staszewski <[email protected]> Diagnosed-by: Andrej Ota <[email protected]> Diagnosed-by: Eric Dumazet <[email protected]> Tested-by: Denys Fedoryshchenko <[email protected]> Tested-by: Pawel Staszewski <[email protected]> Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: Andrej Ota <[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 @@ -948,7 +948,7 @@ static int __pppoe_xmit(struct sock *sk, abort: kfree_skb(skb); - return 0; + return 1; } /************************************************************************ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
