Message ID | 1380572952-30729-11-git-send-email-andi@firstfloor.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Andi Kleen <andi@firstfloor.org> Date: Mon, 30 Sep 2013 13:29:11 -0700 > From: Andi Kleen <ak@linux.intel.com> > > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7c83cb8..f3ed78d 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)) {