Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 142dcdd3 authored by Phil Oester's avatar Phil Oester Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_conntrack_ipv6: Plug sk_buff leak in fragment handling 



In commit 4cdd3408 ("netfilter: nf_conntrack_ipv6: improve fragmentation
handling"), an sk_buff leak was introduced when dealing with reassembled
packets by grabbing a reference to the original skb instead of the
reassembled skb.  At this point, the leak only impacted conntracks with an
associated helper.

In commit 58a317f1 ("netfilter: ipv6: add IPv6 NAT support"), the bug was
expanded to include all reassembled packets with unconfirmed conntracks.

Fix this by grabbing a reference to the proper reassembled skb.  This
closes netfilter bugzilla #823.

Signed-off-by: default avatarPhil Oester <kernel@linuxace.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 06f3d7f9

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static unsigned int __ipv6_conntrack_in(struct net *net, 
		if (ct != NULL && !nf_ct_is_untracked(ct)) {

			help = nfct_help(ct);

			if ((help && help->helper) || !nf_ct_is_confirmed(ct)) {

				nf_conntrack_get_reasm(skb);

				nf_conntrack_get_reasm(reasm);

				NF_HOOK_THRESH(NFPROTO_IPV6, hooknum, reasm,

					       (struct net_device *)in,

					       (struct net_device *)out,