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:45 +0000
|
|
Subject: 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>
|
|
---
|
|
net/atm/pvc.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
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;
|