aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 11:31:44 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 09:47:05 -0700
commit9a897ce370b0bbe57961372c67bd0ffc2dd3f7ea (patch)
treee97810b11fca7c856ddd83f69670b24137163489 /net/atm
parentf9b6caca04a5444f61c1b08ebf04c6f2c6ff2ec9 (diff)
downloadkernel_samsung_smdk4412-9a897ce370b0bbe57961372c67bd0ffc2dd3f7ea.zip
kernel_samsung_smdk4412-9a897ce370b0bbe57961372c67bd0ffc2dd3f7ea.tar.gz
kernel_samsung_smdk4412-9a897ce370b0bbe57961372c67bd0ffc2dd3f7ea.tar.bz2
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/atm')
-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 22b963d..cc859ad 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;