diff options
| author | Daniele Di Proietto <diproiettod@ovn.org> | 2016-11-28 15:43:53 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-30 11:00:45 -0500 |
| commit | f92a80a9972175a6a1d36c6c44be47fb0efd020d (patch) | |
| tree | eb5a009d9cec66c4758bd72773dfb65b6222067a | |
| parent | f2ebf2a6ca94e78be179e8c99d34c87efc5e8bfb (diff) | |
| download | linux-f92a80a9972175a6a1d36c6c44be47fb0efd020d.tar.bz2 | |
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>
| -rw-r--r-- | net/openvswitch/conntrack.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 31045ef44a82..fecefa2dc94e 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -370,8 +370,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.mru = IP6CB(skb)->frag_max_size; |