Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET_SCHED]: act_ipt: fix regression in ipt action
This commit is contained in:
commit
6cdd12acb6
|
@ -55,7 +55,8 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
|
||||||
struct ipt_target *target;
|
struct ipt_target *target;
|
||||||
int ret = 0;
|
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)
|
if (!target)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
|
@ -63,9 +64,10 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
|
||||||
|
|
||||||
ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
|
ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
|
||||||
table, hook, 0, 0);
|
table, hook, 0, 0);
|
||||||
if (ret)
|
if (ret) {
|
||||||
|
module_put(t->u.kernel.target->me);
|
||||||
return ret;
|
return ret;
|
||||||
|
}
|
||||||
if (t->u.kernel.target->checkentry
|
if (t->u.kernel.target->checkentry
|
||||||
&& !t->u.kernel.target->checkentry(table, NULL,
|
&& !t->u.kernel.target->checkentry(table, NULL,
|
||||||
t->u.kernel.target, t->data,
|
t->u.kernel.target, t->data,
|
||||||
|
|
Loading…
Reference in New Issue