diff mbox

[maverick,CVE,1/1] net: packet: fix information leak to userland

Message ID 1296570387-30250-6-git-send-email-apw@canonical.com
State Accepted
Commit a88c702b4502c122694ae6da8dd55d6e6b2c4561
Headers show

Commit Message

Andy Whitcroft Feb. 1, 2011, 2:26 p.m. UTC 
From: Vasiliy Kulikov <segooon@gmail.com>

packet_getname_spkt() doesn't initialize all members of sa_data field of
sockaddr struct if strlen(dev->name) < 13.  This structure is then copied
to userland.  It leads to leaking of contents of kernel stack memory.
We have to fully fill sa_data with strncpy() instead of strlcpy().

The same with packet_getname(): it doesn't initialize sll_pkttype field of
sockaddr_ll.  Set it to zero.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

CVE-2010-3876
BugLink: http://bugs.launchpad.net/bugs/710714
(cherry picked from commit 67286640f638f5ad41a946b9a3dc75327950248f upstream)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 net/packet/af_packet.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 2078a27..f68ee46 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1704,7 +1704,7 @@  static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr,
 	rcu_read_lock();
 	dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex);
 	if (dev)
-		strlcpy(uaddr->sa_data, dev->name, 15);
+		strncpy(uaddr->sa_data, dev->name, 14);
 	else
 		memset(uaddr->sa_data, 0, 14);
 	rcu_read_unlock();
@@ -1727,6 +1727,7 @@  static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
 	sll->sll_family = AF_PACKET;
 	sll->sll_ifindex = po->ifindex;
 	sll->sll_protocol = po->num;
+	sll->sll_pkttype = 0;
 	rcu_read_lock();
 	dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex);
 	if (dev) {