linux-kernel - [079/152] pppoe.c: Fix kernel panic caused by __pppoe

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110106002304.175800062@clark.site>
Date:	Wed, 05 Jan 2011 16:22:58 -0800
From:	Greg KH <gregkh@...e.de>
To:	linux-kernel@...r.kernel.org, stable@...nel.org
Cc:	stable-review@...nel.org, torvalds@...ux-foundation.org,
	akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
	Jarek Poplawski <jarkao2@...il.com>,
	Andrej Ota <andrej@....si>,
	"David S. Miller" <davem@...emloft.net>
Subject: [079/152] pppoe.c: Fix kernel panic caused by __pppoe_xmit

2.6.36-stable review patch.  If anyone has any objections, please let us know.

------------------


From: Andrej Ota <andrej@....si>

[ 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 <gvs@...os.net>
Reported-by: Daniel Kenzelmann <kernel.bugzilla@...zelmann.dyndns.info>
Reported-by: Denys Fedoryshchenko <nuclearcat@...learcat.com>
Reported-by: Pawel Staszewski <pstaszewski@...com.pl>
Diagnosed-by: Andrej Ota <andrej@....si>
Diagnosed-by: Eric Dumazet <eric.dumazet@...il.com>
Tested-by: Denys Fedoryshchenko <nuclearcat@...learcat.com>
Tested-by: Pawel Staszewski <pstaszewski@...com.pl>
Signed-off-by: Jarek Poplawski <jarkao2@...il.com>
Signed-off-by: Andrej Ota <andrej@....si>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
 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;
 }
 
 /************************************************************************


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/