diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /net/ipv4/tcp_input.c | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 3c426cb318e..e663b78a2ef 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3930,7 +3930,7 @@ u8 *tcp_parse_md5sig_option(struct tcphdr *th) if (opsize < 2 || opsize > length) return NULL; if (opcode == TCPOPT_MD5SIG) - return ptr; + return opsize == TCPOLEN_MD5SIG ? ptr : NULL; } ptr += opsize - 2; length -= opsize; |