Patch "openvswitch: Fix helper reference leak" has been added to the 4.3-stable tree

Patch "openvswitch: Fix helper reference leak" has been added to the 4.3-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    openvswitch: Fix helper reference leak

to the 4.3-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     openvswitch-fix-helper-reference-leak.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Wed Dec 30 19:48:47 PST 2015
From: Joe Stringer <joe@ovn.org>
Date: Wed, 9 Dec 2015 14:07:39 -0800
Subject: openvswitch: Fix helper reference leak

From: Joe Stringer <joe@ovn.org>

[ Upstream commit 2f3ab9f9fc23811188b9d07d86e4d99ffee887f4 ]

If the actions (re)allocation fails, or the actions list is larger than the
maximum size, and the conntrack action is the last action when these
problems are hit, then references to helper modules may be leaked. Fix
the issue.

Fixes: cae3a2627520 ("openvswitch: Allow attaching helpers to ct action")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/openvswitch/conntrack.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -53,6 +53,8 @@ struct ovs_conntrack_info {
 	struct md_labels labels;
 };
 
+static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info);
+
 static u16 key_to_nfproto(const struct sw_flow_key *key)
 {
 	switch (ntohs(key->eth.type)) {
@@ -708,7 +710,7 @@ int ovs_ct_copy_action(struct net *net,
 	nf_conntrack_get(&ct_info.ct->ct_general);
 	return 0;
 err_free_ct:
-	nf_conntrack_free(ct_info.ct);
+	__ovs_ct_free_action(&ct_info);
 	return err;
 }
 
@@ -750,6 +752,11 @@ void ovs_ct_free_action(const struct nla
 {
 	struct ovs_conntrack_info *ct_info = nla_data(a);
 
+	__ovs_ct_free_action(ct_info);
+}
+
+static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info)
+{
 	if (ct_info->helper)
 		module_put(ct_info->helper->me);
 	if (ct_info->ct)


Patches currently in stable-queue which might be from joe@ovn.org are

queue-4.3/openvswitch-respect-conntrack-zone-even-if-invalid.patch
queue-4.3/openvswitch-fix-helper-reference-leak.patch

Re: Patch "openvswitch: Fix helper reference leak" has been added to the 4.3-stable tree

[Joe Stringer]

On 30 December 2015 at 19:53,  <gregkh@linuxfoundation.org> wrote:
>
> This is a note to let you know that I've just added the patch titled
>
>     openvswitch: Fix helper reference leak
>
> to the 4.3-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
>      openvswitch-fix-helper-reference-leak.patch
> and it can be found in the queue-4.3 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.

<snip>

[catching up on emails, apologies for the delay..]

The patch mentioned above had another issue, this patch fixes it:
https://patchwork.ozlabs.org/patch/560757/

Re: Patch "openvswitch: Fix helper reference leak" has been added to the 4.3-stable tree

[Greg KH]

On Wed, Jan 06, 2016 at 11:45:44AM -0800, Joe Stringer wrote:
> On 30 December 2015 at 19:53,  <gregkh@linuxfoundation.org> wrote:
> >
> > This is a note to let you know that I've just added the patch titled
> >
> >     openvswitch: Fix helper reference leak
> >
> > to the 4.3-stable tree which can be found at:
> >     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> >
> > The filename of the patch is:
> >      openvswitch-fix-helper-reference-leak.patch
> > and it can be found in the queue-4.3 subdirectory.
> >
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> 
> <snip>
> 
> [catching up on emails, apologies for the delay..]
> 
> The patch mentioned above had another issue, this patch fixes it:
> https://patchwork.ozlabs.org/patch/560757/

A patch needs to be in Linus's tree before I can do anything with it for
a stable release...