diff options
| author | Daniele Di Proietto <diproiettod@vmware.com> | 2016-11-30 10:24:43 -0800 |
|---|---|---|
| committer | Daniele Di Proietto <diproiettod@vmware.com> | 2016-11-30 15:28:13 -0800 |
| commit | 6b4fe5a9b149b119622db8a6d1533b38d1ac6b7b (patch) | |
| tree | 16171a5a3de0e73ef75d4b7c6ac0d1dde47fd3b6 /datapath | |
| parent | 84a13f614f64b74dd5c1f7a7c0ca2ff755255057 (diff) | |
| download | openvswitch-6b4fe5a9b149b119622db8a6d1533b38d1ac6b7b.tar.gz | |
datapath: backport: openvswitch: Fix skb leak in IPv6 reassembly.
commit f92a80a9972175a6a1d36c6c44be47fb0efd020d
Author: Daniele Di Proietto <diproiettod@ovn.org>
Date: Mon Nov 28 15:43:53 2016 -0800
openvswitch: Fix skb leak in IPv6 reassembly.
If nf_ct_frag6_gather() returns an error other than -EINPROGRESS, it
means that we still have a reference to the skb. We should free it
before returning from handle_fragments, as stated in the comment above.
Fixes: daaa7d647f81 ("netfilter: ipv6: avoid nf_iterate recursion")
CC: Florian Westphal <fw@strlen.de>
CC: Pravin B Shelar <pshelar@ovn.org>
CC: Joe Stringer <joe@ovn.org>
Signed-off-by: Daniele Di Proietto <diproiettod@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
VMware-BZ: #1728498
Fixes: 2e602ea3dafa("compat: nf_defrag_ipv6: avoid nf_iterate recursion.")
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/conntrack.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 6e722b6eb..d942884e2 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -424,8 +424,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, skb_orphan(skb); memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm)); err = nf_ct_frag6_gather(net, skb, user); - if (err) + if (err) { + if (err != -EINPROGRESS) + kfree_skb(skb); return err; + } key->ip.proto = ipv6_hdr(skb)->nexthdr; ovs_cb.dp_cb.mru = IP6CB(skb)->frag_max_size; |