summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2013-09-30 13:29:11 -0700
committerDavid S. Miller <davem@davemloft.net>2013-10-02 16:32:43 -0400
commit5843ef421311c34f06d5ab82bced5aebfe185b2c (patch)
tree6c0900e7c8557e22ea382554cb3bd7c88e5be9d6 /net/ipv4
parent58e4e1f6cacddb7823c44bcfb272174553f6c645 (diff)
downloadop-kernel-dev-5843ef421311c34f06d5ab82bced5aebfe185b2c.zip
op-kernel-dev-5843ef421311c34f06d5ab82bced5aebfe185b2c.tar.gz
tcp: Always set options to 0 before calling tcp_established_options
tcp_established_options assumes opts->options is 0 before calling, as it read modify writes it. For the tcp_current_mss() case the opts structure is not zeroed, so this can be done with uninitialized values. This is ok, because ->options is not read in this path. But it's still better to avoid the operation on the uninitialized field. This shuts up a static code analyzer, and presumably may help the optimizer. Cc: netdev@vger.kernel.org Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_output.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e6bb825..c6f01f2 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -637,6 +637,8 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
unsigned int size = 0;
unsigned int eff_sacks;
+ opts->options = 0;
+
#ifdef CONFIG_TCP_MD5SIG
*md5 = tp->af_specific->md5_lookup(sk, sk);
if (unlikely(*md5)) {
OpenPOWER on IntegriCloud