diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 13:12:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 13:12:47 -0700 |
| commit | 4ada8107f465b97326751de66d3c11ed78bf8214 (patch) | |
| tree | c25db4b4b8f9297b61d357b6df33ca106901f84f /net/ipv6 | |
| parent | 303c6a0251852ecbdc5c15e466dcaff5971f7517 (diff) | |
| parent | d1238d5337e8e53cddea77c2a26d26b6eb5a982f (diff) | |
| download | op-kernel-dev-4ada8107f465b97326751de66d3c11ed78bf8214.zip op-kernel-dev-4ada8107f465b97326751de66d3c11ed78bf8214.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index ed4d79a..058a5e4 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -528,14 +528,14 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff) if (!ipv6_ext_hdr(nexthdr)) { return -1; } - if (len < (int)sizeof(struct ipv6_opt_hdr)) { - pr_debug("too short\n"); - return -1; - } if (nexthdr == NEXTHDR_NONE) { pr_debug("next header is none\n"); return -1; } + if (len < (int)sizeof(struct ipv6_opt_hdr)) { + pr_debug("too short\n"); + return -1; + } if (skb_copy_bits(skb, start, &hdr, sizeof(hdr))) BUG(); if (nexthdr == NEXTHDR_AUTH) |
