Skip to content

Commit

Permalink
[NET_SCHED]: act_ipt: fix regression in ipt action
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Patrick McHardy <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
kaber authored and davem330 committed Feb 2, 2007
1 parent e34efe3 commit 239a87c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/sched/act_ipt.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,19 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
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;

t->u.kernel.target = target;

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,
Expand Down

0 comments on commit 239a87c

Please sign in to comment.