net_sched: fix a regression in tc actions
This patch fixes:
1) pass mask rather than size to tcf_hashinfo_init()
2) the cleanup should be in reversed order in mirred_cleanup_module()
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Fixes: 369ba56787
("net_sched: init struct tcf_hashinfo at register time")
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
852ad5e631
Коммит
568a153a22
|
@ -586,7 +586,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
static int __init csum_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&csum_hash_info, CSUM_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&csum_hash_info, CSUM_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
|
@ -208,7 +208,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
static int __init gact_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&gact_hash_info, GACT_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&gact_hash_info, GACT_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
#ifdef CONFIG_GACT_PROB
|
||||
|
|
|
@ -314,7 +314,7 @@ MODULE_ALIAS("act_xt");
|
|||
static int __init ipt_init_module(void)
|
||||
{
|
||||
int ret1, ret2, err;
|
||||
err = tcf_hashinfo_init(&ipt_hash_info, IPT_TAB_MASK+1);
|
||||
err = tcf_hashinfo_init(&ipt_hash_info, IPT_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
|
@ -276,7 +276,7 @@ static int __init mirred_init_module(void)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
err = tcf_hashinfo_init(&mirred_hash_info, MIRRED_TAB_MASK+1);
|
||||
err = tcf_hashinfo_init(&mirred_hash_info, MIRRED_TAB_MASK);
|
||||
if (err) {
|
||||
unregister_netdevice_notifier(&mirred_device_notifier);
|
||||
return err;
|
||||
|
@ -287,9 +287,9 @@ static int __init mirred_init_module(void)
|
|||
|
||||
static void __exit mirred_cleanup_module(void)
|
||||
{
|
||||
unregister_netdevice_notifier(&mirred_device_notifier);
|
||||
tcf_hashinfo_destroy(&mirred_hash_info);
|
||||
tcf_unregister_action(&act_mirred_ops);
|
||||
tcf_hashinfo_destroy(&mirred_hash_info);
|
||||
unregister_netdevice_notifier(&mirred_device_notifier);
|
||||
}
|
||||
|
||||
module_init(mirred_init_module);
|
||||
|
|
|
@ -310,7 +310,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
static int __init nat_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&nat_hash_info, NAT_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&nat_hash_info, NAT_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
return tcf_register_action(&act_nat_ops);
|
||||
|
|
|
@ -246,7 +246,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
static int __init pedit_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&pedit_hash_info, PEDIT_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&pedit_hash_info, PEDIT_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
return tcf_register_action(&act_pedit_ops);
|
||||
|
|
|
@ -396,7 +396,7 @@ static struct tc_action_ops act_police_ops = {
|
|||
static int __init
|
||||
police_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&police_hash_info, POL_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&police_hash_info, POL_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
err = tcf_register_action(&act_police_ops);
|
||||
|
|
|
@ -203,7 +203,7 @@ MODULE_LICENSE("GPL");
|
|||
static int __init simp_init_module(void)
|
||||
{
|
||||
int err, ret;
|
||||
err = tcf_hashinfo_init(&simp_hash_info, SIMP_TAB_MASK+1);
|
||||
err = tcf_hashinfo_init(&simp_hash_info, SIMP_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
|
@ -203,7 +203,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
static int __init skbedit_init_module(void)
|
||||
{
|
||||
int err = tcf_hashinfo_init(&skbedit_hash_info, SKBEDIT_TAB_MASK+1);
|
||||
int err = tcf_hashinfo_init(&skbedit_hash_info, SKBEDIT_TAB_MASK);
|
||||
if (err)
|
||||
return err;
|
||||
return tcf_register_action(&act_skbedit_ops);
|
||||
|
|
Загрузка…
Ссылка в новой задаче