diff options
| author | Mathias Krause <minipli@googlemail.com> | 2012-08-15 11:31:45 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:41 +0200 |
| commit | dde45d396e5d0395b821a536a22b545ce9d45618 (patch) | |
| tree | a3e22d6c80e41db9ec6e410348876f075e6f9713 /net | |
| parent | 531539ab21be455b59226d241a3274bead7458ab (diff) | |
atm: fix info leak via getsockname()
commit 3c0c5cfdcd4d69ffc4b9c0907cec99039f30a50a upstream.
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>
[bwh: Backported to 2.6.32: adjust context]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/pvc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/pvc.c b/net/atm/pvc.c index d4c024504f9..523c21a5b0f 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c @@ -93,6 +93,7 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr, if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) 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; |