]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - net/ipv6/netfilter/nf_conntrack_reasm.c
netfilter: ipv6: nf_defrag: avoid/free clone operations
authorFlorian Westphal <fw@strlen.de>
Wed, 18 Nov 2015 22:32:39 +0000 (23:32 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 23 Nov 2015 16:54:44 +0000 (17:54 +0100)
commit029f7f3b8701cc7aca8bdb31f0c7edd6a479e357
tree51e195fc33eca0200bb40f30fb8a84e4f8d3d655
parenta18fd970ce99eee5105a511621d7064812b8cc8c
netfilter: ipv6: nf_defrag: avoid/free clone operations

commit 6aafeef03b9d9ecf
("netfilter: push reasm skb through instead of original frag skbs")
changed ipv6 defrag to not use the original skbs anymore.

So rather than keeping the original skbs around just to discard them
afterwards just use the original skbs directly for the fraglist of
the newly assembled skb and remove the extra clone/free operations.

The skb that completes the fragment queue is morphed into a the
reassembled one instead, just like ipv4 defrag.

openvswitch doesn't need any additional skb_morph magic anymore to deal
with this situation so just remove that.

A followup patch can then also remove the NF_HOOK (re)invocation in
the ipv6 netfilter defrag hook.

Cc: Joe Stringer <joestringer@nicira.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/ipv6/nf_defrag_ipv6.h
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
net/openvswitch/conntrack.c