| From 3eeab99dbfc26b4ffd50053945d1a27d45de0aed Mon Sep 17 00:00:00 2001 |
| From: Mike Waychison <mikew@google.com> |
| Date: Wed, 10 Aug 2011 21:59:57 -0700 |
| Subject: tcp: initialize variable ecn_ok in syncookies path |
| |
| |
| From: Mike Waychison <mikew@google.com> |
| |
| [ Upstream commit f0e3d0689da401f7d1981c2777a714ba295ea5ff ] |
| |
| Using a gcc 4.4.3, warnings are emitted for a possibly uninitialized use |
| of ecn_ok. |
| |
| This can happen if cookie_check_timestamp() returns due to not having |
| seen a timestamp. Defaulting to ecn off seems like a reasonable thing |
| to do in this case, so initialized ecn_ok to false. |
| |
| Signed-off-by: Mike Waychison <mikew@google.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| net/ipv4/syncookies.c | 2 +- |
| net/ipv6/syncookies.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv4/syncookies.c |
| +++ b/net/ipv4/syncookies.c |
| @@ -276,7 +276,7 @@ struct sock *cookie_v4_check(struct sock |
| int mss; |
| struct rtable *rt; |
| __u8 rcv_wscale; |
| - bool ecn_ok; |
| + bool ecn_ok = false; |
| |
| if (!sysctl_tcp_syncookies || !th->ack || th->rst) |
| goto out; |
| --- a/net/ipv6/syncookies.c |
| +++ b/net/ipv6/syncookies.c |
| @@ -165,7 +165,7 @@ struct sock *cookie_v6_check(struct sock |
| int mss; |
| struct dst_entry *dst; |
| __u8 rcv_wscale; |
| - bool ecn_ok; |
| + bool ecn_ok = false; |
| |
| if (!sysctl_tcp_syncookies || !th->ack || th->rst) |
| goto out; |