diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-30 06:03:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-30 06:27:25 -0400 |
| commit | 785957d3e8c6fb37b18bf671923a76dbd8240025 (patch) | |
| tree | 59f089e4bd109ad9d896c6e6a0f1699f42a34136 /net/ipv6/tcp_ipv6.c | |
| parent | 8d50b53d66a8a6ae41bafbdcabe401467803f33a (diff) | |
tcp: MD5: Use MIB counter instead of warning for MD5 mismatch.
From a report by Matti Aarnio, and preliminary patch by Adam Langley.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index cff778b23a7f..1db45216b232 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -849,28 +849,17 @@ static int tcp_v6_inbound_md5_hash (struct sock *sk, struct sk_buff *skb) | |||
| 849 | hash_expected = tcp_v6_md5_do_lookup(sk, &ip6h->saddr); | 849 | hash_expected = tcp_v6_md5_do_lookup(sk, &ip6h->saddr); |
| 850 | hash_location = tcp_parse_md5sig_option(th); | 850 | hash_location = tcp_parse_md5sig_option(th); |
| 851 | 851 | ||
| 852 | /* do we have a hash as expected? */ | 852 | /* We've parsed the options - do we have a hash? */ |
| 853 | if (!hash_expected) { | 853 | if (!hash_expected && !hash_location) |
| 854 | if (!hash_location) | 854 | return 0; |
| 855 | return 0; | 855 | |
| 856 | if (net_ratelimit()) { | 856 | if (hash_expected && !hash_location) { |
| 857 | printk(KERN_INFO "MD5 Hash NOT expected but found " | 857 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND); |
| 858 | "(" NIP6_FMT ", %u)->" | ||
| 859 | "(" NIP6_FMT ", %u)\n", | ||
| 860 | NIP6(ip6h->saddr), ntohs(th->source), | ||
| 861 | NIP6(ip6h->daddr), ntohs(th->dest)); | ||
| 862 | } | ||
| 863 | return 1; | 858 | return 1; |
| 864 | } | 859 | } |
| 865 | 860 | ||
| 866 | if (!hash_location) { | 861 | if (!hash_expected && hash_location) { |
| 867 | if (net_ratelimit()) { | 862 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED); |
| 868 | printk(KERN_INFO "MD5 Hash expected but NOT found " | ||
| 869 | "(" NIP6_FMT ", %u)->" | ||
| 870 | "(" NIP6_FMT ", %u)\n", | ||
| 871 | NIP6(ip6h->saddr), ntohs(th->source), | ||
| 872 | NIP6(ip6h->daddr), ntohs(th->dest)); | ||
| 873 | } | ||
| 874 | return 1; | 863 | return 1; |
| 875 | } | 864 | } |
| 876 | 865 | ||
