Patchwork [Lucid,CVE-2012-6546,2/2] atm: fix info leak in getsockopt(SO_ATMPVC)

login
register
mail settings
Submitter Luis Henriques
Date March 26, 2013, 5:18 p.m.
Message ID <1364318313-17073-2-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/231489/
State New
Headers show

Comments

Luis Henriques - March 26, 2013, 5:18 p.m.
From: Mathias Krause <minipli@googlemail.com>

CVE-2012-6546

BugLink: http://bugs.launchpad.net/bugs/1156759

The ATM code fails to initialize the two padding bytes of struct
sockaddr_atmpvc inserted for alignment. Add an explicit memset(0)
before filling the structure to avoid the info leak.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(back ported from commit e862f1a9b7df4e8196ebec45ac62295138aa3fc2)

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

Conflicts:
	net/atm/common.c
---
 net/atm/common.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/net/atm/common.c b/net/atm/common.c
index 950bd16..0baf05e 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -749,6 +749,7 @@  int vcc_getsockopt(struct socket *sock, int level, int optname,
 				if (!vcc->dev ||
 				    !test_bit(ATM_VF_ADDR,&vcc->flags))
 					return -ENOTCONN;
+				memset(&pvc, 0, sizeof(pvc));
 				pvc.sap_family = AF_ATMPVC;
 				pvc.sap_addr.itf = vcc->dev->number;
 				pvc.sap_addr.vpi = vcc->vpi;