Return-Path: Message-Id: <20130604172137.561062802@1wt.eu> Date: Tue, 04 Jun 2013 19:24:25 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mathias Krause , "David S. Miller" , Willy Tarreau Subject: [ 175/184] atm: fix info leak in getsockopt(SO_ATMPVC) In-Reply-To: <58df134a4b98edf5b0073e2e1e988fe6@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Mathias Krause 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 Signed-off-by: David S. Miller [bwh: Backported to 2.6.32: adjust context, indentation] Signed-off-by: Willy Tarreau --- net/atm/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/atm/common.c b/net/atm/common.c index 6c82d72..65737b8 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; -- 1.7.12.2.21.g234cd45.dirty