From b52dc5373fdf57144bd70b179742ab1ed952959a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 11 Oct 2012 06:24:14 +0000 Subject: [PATCH] --- yaml --- r: 334021 b: refs/heads/master c: 0e24c4fc52b16f0a1102a933f636d2f350c41098 h: refs/heads/master i: 334019: 39f2fb692a50bd39ec6994570e9e1b10922900e8 v: v3 --- [refs] | 2 +- trunk/net/ipv4/sysctl_net_ipv4.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 37c9a88caaec..453a4e3a6614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0abc1ceec52fcb9f962a2cd52e89baccccbc1d2e +refs/heads/master: 0e24c4fc52b16f0a1102a933f636d2f350c41098 diff --git a/trunk/net/ipv4/sysctl_net_ipv4.c b/trunk/net/ipv4/sysctl_net_ipv4.c index 9205e492dc9d..63d4eccc674d 100644 --- a/trunk/net/ipv4/sysctl_net_ipv4.c +++ b/trunk/net/ipv4/sysctl_net_ipv4.c @@ -248,6 +248,8 @@ int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer, ctxt = rcu_dereference(tcp_fastopen_ctx); if (ctxt) memcpy(user_key, ctxt->key, TCP_FASTOPEN_KEY_LENGTH); + else + memset(user_key, 0, sizeof(user_key)); rcu_read_unlock(); snprintf(tbl.data, tbl.maxlen, "%08x-%08x-%08x-%08x",