diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-11-12 11:04:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-12 11:04:26 -0800 |
| commit | 7c13a0d9a1ac6875f6380763b947f4a5a016605f (patch) | |
| tree | fbf7b41bc8cc250e6f9add13541e7d1c408a33b8 /net | |
| parent | rtnetlink: Fix message size calculation for link messages (diff) | |
| parent | netfilter: ipv6: fix overlap check for fragments (diff) | |
| download | linux-dev-7c13a0d9a1ac6875f6380763b947f4a5a016605f.tar.xz linux-dev-7c13a0d9a1ac6875f6380763b947f4a5a016605f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 3a3f129a44cb..79d43aa8fa8d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -286,7 +286,7 @@ found: /* Check for overlap with preceding fragment. */ if (prev && - (NFCT_FRAG6_CB(prev)->offset + prev->len) - offset > 0) + (NFCT_FRAG6_CB(prev)->offset + prev->len) > offset) goto discard_fq; /* Look for overlap with succeeding segment. */ |