Commit f92a80a9 authored by Daniele Di Proietto's avatar Daniele Di Proietto Committed by David S. Miller

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: daaa7d64 ("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: default avatarDaniele Di Proietto <diproiettod@ovn.org>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2ebf2a6
...@@ -370,8 +370,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key, ...@@ -370,8 +370,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key,
skb_orphan(skb); skb_orphan(skb);
memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm)); memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
err = nf_ct_frag6_gather(net, skb, user); err = nf_ct_frag6_gather(net, skb, user);
if (err) if (err) {
if (err != -EINPROGRESS)
kfree_skb(skb);
return err; return err;
}
key->ip.proto = ipv6_hdr(skb)->nexthdr; key->ip.proto = ipv6_hdr(skb)->nexthdr;
ovs_cb.mru = IP6CB(skb)->frag_max_size; ovs_cb.mru = IP6CB(skb)->frag_max_size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment