summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 11:31:44 +0000
committerBen Hutchings <ben@decadent.org.uk>2012-09-19 15:04:50 +0100
commit3d9e0c7f9adf3b5bbdc257d4c70ead09947cc304 (patch)
tree00831ebea9d5536287986060da2cd773b87c2cc2
parent86134afa03b3d154314e81bbc874dfec66ab74c0 (diff)
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>
-rw-r--r--net/atm/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index 14ff9fe39989..0ca06e851e7c 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;