git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for...
[pandora-kernel.git]
/
net
/
netfilter
/
nf_conntrack_proto_tcp.c
diff --git
a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index
37bf943
..
8235b86
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_tcp.c
+++ b/
net/netfilter/nf_conntrack_proto_tcp.c
@@
-409,7
+409,7
@@
static void tcp_options(const struct sk_buff *skb,
if (opsize < 2) /* "silly options" */
return;
if (opsize > length)
if (opsize < 2) /* "silly options" */
return;
if (opsize > length)
-
break;
/* don't parse partial options */
+
return;
/* don't parse partial options */
if (opcode == TCPOPT_SACK_PERM
&& opsize == TCPOLEN_SACK_PERM)
if (opcode == TCPOPT_SACK_PERM
&& opsize == TCPOLEN_SACK_PERM)
@@
-447,7
+447,7
@@
static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff,
BUG_ON(ptr == NULL);
/* Fast path for timestamp-only option */
BUG_ON(ptr == NULL);
/* Fast path for timestamp-only option */
- if (length == TCPOLEN_TSTAMP_ALIGNED
*4
+ if (length == TCPOLEN_TSTAMP_ALIGNED
&& *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
| (TCPOPT_NOP << 16)
| (TCPOPT_TIMESTAMP << 8)
&& *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
| (TCPOPT_NOP << 16)
| (TCPOPT_TIMESTAMP << 8)
@@
-469,7
+469,7
@@
static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff,
if (opsize < 2) /* "silly options" */
return;
if (opsize > length)
if (opsize < 2) /* "silly options" */
return;
if (opsize > length)
-
break;
/* don't parse partial options */
+
return;
/* don't parse partial options */
if (opcode == TCPOPT_SACK
&& opsize >= (TCPOLEN_SACK_BASE
if (opcode == TCPOPT_SACK
&& opsize >= (TCPOLEN_SACK_BASE