On Mon, Nov 28, 2016 at 3:43 PM, Daniele Di Proietto <[email protected]> wrote: > 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 <[email protected]> > CC: Pravin B Shelar <[email protected]> > CC: Joe Stringer <[email protected]> > Signed-off-by: Daniele Di Proietto <[email protected]> > --- > net/openvswitch/conntrack.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c > index 31045ef..fecefa2 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; > + } >
This fixes the code. But the patch is adding yet another skb-kfree in conntrack code. we could simplify it by reusing error handling in do_execute_actions(). If you think that is too complicated for stable branch, I am fine with this patch going in as it is.
