From: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
Date: Tue, 17 Feb 2015 19:15:20 +0000 (+0100)
Subject: ematch: Fix auto-loading of ematch modules.
X-Git-Tag: v2.6.32.66~22
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20914ec48a0bdce899c7a97a8ba720110a0ee9c5;p=linux

ematch: Fix auto-loading of ematch modules.

[ Upstream commit 34eea79e2664b314cab6a30fc582fdfa7a1bb1df ]

In tcf_em_validate(), after calling request_module() to load the
kind-specific module, set em->ops to NULL before returning -EAGAIN, so
that module_put() is not called again by tcf_em_tree_destroy().

Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
Acked-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 9405be73262273a6904688fb2f1e60a13117cf1b)

Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index aab59409728b..3dff06f2b6bd 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -222,6 +222,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
 				 * perform the module load. Tell the caller
 				 * to replay the request. */
 				module_put(em->ops->owner);
+				em->ops = NULL;
 				err = -EAGAIN;
 			}
 #endif