openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net_sched: fix regression in tc_action_ops 

list_for_each_entry(a, &act_base, head) doesn't
exit with a = NULL if we reached the end of the list.

tcf_unregister_action(), tc_lookup_action_n() and tc_lookup_action()
need fixes.

Remove tc_lookup_action_id() as its unused and not worth 'fixing'

Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 1f747c26c4 ("net_sched: convert tc_action_ops to use struct list_head")
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2013-12-20 12:32:32 -08:00 committed by David S. Miller
parent dcd7608134
commit a792866ad2
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
net/sched/act_api.c
View File

@ -291,12 +291,12 @@ int tcf_unregister_action(struct tc_action_ops *act)
int err = -ENOENT; int err = -ENOENT;
write_lock(&act_mod_lock); write_lock(&act_mod_lock);
list_for_each_entry(a, &act_base, head) list_for_each_entry(a, &act_base, head) {
if (a == act) if (a == act) {
list_del(&act->head);
err = 0;
break; break;
if (a) { }
list_del(&act->head);
err = 0;
} }
write_unlock(&act_mod_lock); write_unlock(&act_mod_lock);
return err; return err;
@ -306,68 +306,41 @@ EXPORT_SYMBOL(tcf_unregister_action);
/* lookup by name */ /* lookup by name */
static struct tc_action_ops *tc_lookup_action_n(char *kind) static struct tc_action_ops *tc_lookup_action_n(char *kind)
{ {
struct tc_action_ops *a = NULL; struct tc_action_ops *a, *res = NULL;
if (kind) { if (kind) {
read_lock(&act_mod_lock); read_lock(&act_mod_lock);
list_for_each_entry(a, &act_base, head) { list_for_each_entry(a, &act_base, head) {
if (strcmp(kind, a->kind) == 0) { if (strcmp(kind, a->kind) == 0) {
if (!try_module_get(a->owner)) { if (try_module_get(a->owner))
read_unlock(&act_mod_lock); res = a;
return NULL;
}
break; break;
} }
} }
read_unlock(&act_mod_lock); read_unlock(&act_mod_lock);
} }
return a; return res;
} }
/* lookup by nlattr */ /* lookup by nlattr */
static struct tc_action_ops *tc_lookup_action(struct nlattr *kind) static struct tc_action_ops *tc_lookup_action(struct nlattr *kind)
{ {
struct tc_action_ops *a = NULL; struct tc_action_ops *a, *res = NULL;
if (kind) { if (kind) {
read_lock(&act_mod_lock); read_lock(&act_mod_lock);
list_for_each_entry(a, &act_base, head) { list_for_each_entry(a, &act_base, head) {
if (nla_strcmp(kind, a->kind) == 0) { if (nla_strcmp(kind, a->kind) == 0) {
if (!try_module_get(a->owner)) { if (try_module_get(a->owner))
read_unlock(&act_mod_lock); res = a;
return NULL;
}
break; break;
} }
} }
read_unlock(&act_mod_lock); read_unlock(&act_mod_lock);
} }
return a; return res;
} }
#if 0
/* lookup by id */
static struct tc_action_ops *tc_lookup_action_id(u32 type)
{
struct tc_action_ops *a = NULL;
if (type) {
read_lock(&act_mod_lock);
for (a = act_base; a; a = a->next) {
if (a->type == type) {
if (!try_module_get(a->owner)) {
read_unlock(&act_mod_lock);
return NULL;
}
break;
}
}
read_unlock(&act_mod_lock);
}
return a;
}
#endif
int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions, int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,
struct tcf_result *res) struct tcf_result *res)
{ {