diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-25 02:23:37 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-25 02:23:37 (GMT) |
| commit | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (patch) | |
| tree | abd5bef16d1a6011f629a36d4e245a2ed4f3df3c /net/ipv6/netfilter/nf_conntrack_reasm.c | |
| parent | fb977e2ca607a7e74946a1de798f474d1b80b9d6 (diff) | |
| parent | 0f234214d15fa914436d304ecf5c3e43449e79f9 (diff) | |
| download | linux-fsl-qoriq-54831a83bfe656c4c54e287c734c6b0ccaa3719b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/netfilter/nf_conntrack_reasm.c')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index ad1fcda..f1171b7 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -469,7 +469,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev) /* all original skbs are linked into the NFCT_FRAG6_CB(head).orig */ fp = skb_shinfo(head)->frag_list; - if (NFCT_FRAG6_CB(fp)->orig == NULL) + if (fp && NFCT_FRAG6_CB(fp)->orig == NULL) /* at above code, head skb is divided into two skbs. */ fp = fp->next; @@ -595,12 +595,6 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user) hdr = ipv6_hdr(clone); fhdr = (struct frag_hdr *)skb_transport_header(clone); - if (!(fhdr->frag_off & htons(0xFFF9))) { - pr_debug("Invalid fragment offset\n"); - /* It is not a fragmented frame */ - goto ret_orig; - } - if (atomic_read(&nf_init_frags.mem) > nf_init_frags.high_thresh) nf_ct_frag6_evictor(); |