From ed6accb2e3f97ffbf232b6e145b5310077992f67 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sun, 23 Mar 2008 22:21:28 -0700 Subject: [PATCH] --- yaml --- r: 90252 b: refs/heads/master c: 2051f11fb86b0056fec440fe7e9fa8370d60a5c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/tcp.h | 2 +- trunk/net/ipv4/syncookies.c | 4 ++-- trunk/net/ipv6/syncookies.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d570333f6277..fb6725ceb623 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 310afe86af8ddd96a06b75aa61ef1af233f80e89 +refs/heads/master: 2051f11fb86b0056fec440fe7e9fa8370d60a5c6 diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index 67cc3956d29c..723b36851dde 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -436,7 +436,7 @@ extern int tcp_disconnect(struct sock *sk, int flags); extern void tcp_unhash(struct sock *sk); /* From syncookies.c */ -extern __u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; +extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; extern struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, struct ip_options *opt); extern __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, diff --git a/trunk/net/ipv4/syncookies.c b/trunk/net/ipv4/syncookies.c index 4704f27f6c0b..abc752d45cf7 100644 --- a/trunk/net/ipv4/syncookies.c +++ b/trunk/net/ipv4/syncookies.c @@ -21,7 +21,7 @@ extern int sysctl_tcp_syncookies; -__u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; +__u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; EXPORT_SYMBOL(syncookie_secret); static __init int init_syncookies(void) @@ -41,7 +41,7 @@ static u32 cookie_hash(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport, { __u32 *tmp = __get_cpu_var(cookie_scratch); - memcpy(tmp + 3, syncookie_secret[c], sizeof(syncookie_secret[c])); + memcpy(tmp + 4, syncookie_secret[c], sizeof(syncookie_secret[c])); tmp[0] = (__force u32)saddr; tmp[1] = (__force u32)daddr; tmp[2] = ((__force u32)sport << 16) + (__force u32)dport; diff --git a/trunk/net/ipv6/syncookies.c b/trunk/net/ipv6/syncookies.c index 827c5aa7524c..3a622e7abc02 100644 --- a/trunk/net/ipv6/syncookies.c +++ b/trunk/net/ipv6/syncookies.c @@ -22,7 +22,7 @@ #include extern int sysctl_tcp_syncookies; -extern __u32 syncookie_secret[2][16-3+SHA_DIGEST_WORDS]; +extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; #define COOKIEBITS 24 /* Upper bits store count */ #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1)