Skip to contentSkip to conversation

: act_ipt: fix regression in ipt action

NET_SCHED Applied Patrick McHardy 3 participants 3 messages Jan 31, 2007 – Feb 2, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

[NET_SCHED]: act_ipt: fix regression in ipt action

The x_tables patch broke target module autoloading in the ipt action by replacing the ipt_find_target call (which does autoloading) by xt_find_target (which doesn't do autoloading). Additionally xt_find_target may return ERR_PTR values in case of an error, which are not handled.

Use xt_request_find_target, which does both autoloading and ERR_PTR handling properly. Also don't forget to drop the target module reference again when xt_check_target fails.

---
commit 0252c2a43dd6b2d14d5c1d95db235d11064f6a0f
tree 441706f4506870381bef87ff46dfe8177749975c
parent 5263bf65d6342e12ab716db8e529501670979321
author Patrick McHardy <[email protected]> Thu, 01 Feb 2007 00:13:51 +0100 committer Patrick McHardy <[email protected]> Thu, 01 Feb 2007 00:13:51 +0100

 net/sched/act_ipt.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
net/sched/act_ipt.c +5 -3
index a960806..01e6913 100644
@@ -55,7 +55,8 @@ static int ipt_init_target(struct ipt_en
 	struct ipt_target *target;
 	int ret = 0;
 
-	target = xt_find_target(AF_INET, t->u.user.name, t->u.user.revision);
+	target = xt_request_find_target(AF_INET, t->u.user.name,
+					t->u.user.revision);
 	if (!target)
 		return -ENOENT;
 
@@ -63,9 +64,10 @@ static int ipt_init_target(struct ipt_en
 
 	ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
 			      table, hook, 0, 0);
-	if (ret)
+	if (ret) {
+		module_put(t->u.kernel.target->me);
 		return ret;
-
+	}
 	if (t->u.kernel.target->checkentry
 	    && !t->u.kernel.target->checkentry(table, NULL,
 		    			       t->u.kernel.target, t->data,
#1 lore raw
Quoted 3 lines · Patrick McHardy

plain text document attachment (x) [NET_SCHED]: act_ipt: fix regression in ipt action

Looks fine to me - Thanks Patrick.

cheers,
jamal