diff options
| author | Mathias Krause <minipli@googlemail.com> | 2012-08-15 11:31:44 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:41 +0200 |
| commit | 55dde8cfc4af2d57a6d8c377f3cd523d1b40e10b (patch) | |
| tree | 44f37eb9a7e3e11ff48d9436fd50dd482f25c3dc | |
| parent | dde45d396e5d0395b821a536a22b545ce9d45618 (diff) | |
atm: fix info leak in getsockopt(SO_ATMPVC)
commit e862f1a9b7df4e8196ebec45ac62295138aa3fc2 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, indentation]
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/atm/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index 6c82d72687f9..65737b81059e 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -751,6 +751,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; |