| From c1b88d7c7a4b4be2f076e1988caf7a46c9c6c18d Mon Sep 17 00:00:00 2001 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Wed, 15 Aug 2012 11:31:44 +0000 |
| Subject: [PATCH] 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| net/atm/common.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/net/atm/common.c b/net/atm/common.c |
| index 97ed94aa0cbc..ec2cb8f3c8d9 100644 |
| --- a/net/atm/common.c |
| +++ b/net/atm/common.c |
| @@ -759,6 +759,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; |
| -- |
| 1.8.5.2 |
| |
