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: v3.2.69~28
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9405be73262273a6904688fb2f1e60a13117cf1b;hp=cab55ceea3dd6f5c3ae1a788ecbf08067c478f54

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>
---

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 88d93eb92507..088342f2cd59 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -227,6 +227,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
 				 * to replay the request.
 				 */
 				module_put(em->ops->owner);
+				em->ops = NULL;
 				err = -EAGAIN;
 			}
 #endif