aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 11:31:45 +0000
committerBen Hutchings <ben@decadent.org.uk>2012-09-19 15:04:50 +0100
commit86cbb1ef4f7b1e6ac6cb65bb34b6949cd5b90c6e (patch)
tree0e5d7ba1c71067a9a33a8721cbcb21dd6aeebcc3 /net/atm
parent3d9e0c7f9adf3b5bbdc257d4c70ead09947cc304 (diff)
downloadkernel_samsung_smdk4412-86cbb1ef4f7b1e6ac6cb65bb34b6949cd5b90c6e.zip
kernel_samsung_smdk4412-86cbb1ef4f7b1e6ac6cb65bb34b6949cd5b90c6e.tar.gz
kernel_samsung_smdk4412-86cbb1ef4f7b1e6ac6cb65bb34b6949cd5b90c6e.tar.bz2
atm: fix info leak via getsockname()
[ Upstream commit 3c0c5cfdcd4d69ffc4b9c0907cec99039f30a50a ] 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>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/pvc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 3a73491..ae03240 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -95,6 +95,7 @@ static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
return -ENOTCONN;
*sockaddr_len = sizeof(struct sockaddr_atmpvc);
addr = (struct sockaddr_atmpvc *)sockaddr;
+ memset(addr, 0, sizeof(*addr));
addr->sap_family = AF_ATMPVC;
addr->sap_addr.itf = vcc->dev->number;
addr->sap_addr.vpi = vcc->vpi;