From 3c5c4f8e5cdcbc5280b0de69342175f473109f5c Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 15 Aug 2012 11:31:44 +0000
Subject: [PATCH] --- yaml --- r: 322010 b: refs/heads/master c:
 e862f1a9b7df4e8196ebec45ac62295138aa3fc2 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/atm/common.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d03f55790bb3..1d9fddc3a7a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3bc4ffb814c847bde7706a80d5684d12c676a8b
+refs/heads/master: e862f1a9b7df4e8196ebec45ac62295138aa3fc2
diff --git a/trunk/net/atm/common.c b/trunk/net/atm/common.c
index b4b44dbed645..0c0ad930a632 100644
--- a/trunk/net/atm/common.c
+++ b/trunk/net/atm/common.c
@@ -812,6 +812,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;