From 5a4ad7851d769df3e1be82108aaaa6f4ee156098 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 15 Aug 2012 11:31:55 +0000
Subject: [PATCH] --- yaml --- r: 322021 b: refs/heads/master c:
 7b07f8eb75aa3097cdfd4f6eac3da49db787381d h: refs/heads/master i:   322019:
 cf2a009fc677dbd34b0d50742df858d90a5256f5 v: v3

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

diff --git a/[refs] b/[refs]
index d6caebc5ca32..bc357aba8c86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 276bdb82dedb290511467a5a4fdbe9f0b52dce6f
+refs/heads/master: 7b07f8eb75aa3097cdfd4f6eac3da49db787381d
diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c
index d65e98798eca..119c04317d48 100644
--- a/trunk/net/dccp/ccids/ccid3.c
+++ b/trunk/net/dccp/ccids/ccid3.c
@@ -535,6 +535,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
 	case DCCP_SOCKOPT_CCID_TX_INFO:
 		if (len < sizeof(tfrc))
 			return -EINVAL;
+		memset(&tfrc, 0, sizeof(tfrc));
 		tfrc.tfrctx_x	   = hc->tx_x;
 		tfrc.tfrctx_x_recv = hc->tx_x_recv;
 		tfrc.tfrctx_x_calc = hc->tx_x_calc;