30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From: Mathias Krause <minipli@googlemail.com>
|
|
Date: Wed, 15 Aug 2012 11:31:44 +0000
|
|
Subject: atm: fix info leak in getsockopt(SO_ATMPVC)
|
|
|
|
[ Upstream commit e862f1a9b7df4e8196ebec45ac62295138aa3fc2 ]
|
|
|
|
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>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
net/atm/common.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/net/atm/common.c b/net/atm/common.c
|
|
index 14ff9fe..0ca06e8 100644
|
|
--- a/net/atm/common.c
|
|
+++ b/net/atm/common.c
|
|
@@ -784,6 +784,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;
|