Merge tag 'platform-drivers-x86-v4.16-3' of git://github.com/dvhart/linux-pdx86

[sfrench/cifs-2.6.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 ce53dcfda88a16db7d7c8aaf67054839fa42bb2f..b84ce3e6d728a5b8af65b91faf42ec640ff03910 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -264,6 +264,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,
                         * this case. -DaveM
                         */
                        pr_debug("end of fragment not rounded to 8 bytes.\n");
+                       inet_frag_kill(&fq->q, &nf_frags);
                        return -EPROTO;
                }
                if (end > fq->q.len) {