Merge tag 'v3.10.105' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / netfilter / nf_conntrack_reasm.c

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 7cd623588532065e3f1ace86620c7ae71dd86406..c11a40caf5b614435df84b9cdefd56fc4730b6f1 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -569,6 +569,9 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
        if (find_prev_fhdr(skb, &prevhdr, &nhoff, &fhoff) < 0)
                return skb;
 
+       if (!net->nf_frag.frags.high_thresh)
+               return skb;
+
        clone = skb_clone(skb, GFP_ATOMIC);
        if (clone == NULL) {
                pr_debug("Can't clone skb\n");