summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 13:31:44 +0200
committerDavid S. Miller <davem@davemloft.net>2012-08-16 06:36:30 +0200
commite862f1a9b7df4e8196ebec45ac62295138aa3fc2 (patch)
treef4c48c1350cd8fe6531eb1fd7cf61b6173524c04 /net
parentvmxnet3: Fix race between dev_open() and register_netdev() (diff)
downloadlinux-e862f1a9b7df4e8196ebec45ac62295138aa3fc2.tar.xz
linux-e862f1a9b7df4e8196ebec45ac62295138aa3fc2.zip
atm: fix info leak in getsockopt(SO_ATMPVC)
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>
Diffstat (limited to 'net')
-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 b4b44dbed645..0c0ad930a632 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -812,6 +812,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;