2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* net/sched/act_api.c Packet action API.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* Author: Jamal Hadi Salim
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/errno.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kmod.h>
|
2008-01-24 04:33:13 +00:00
|
|
|
#include <linux/err.h>
|
2011-05-27 13:12:25 +00:00
|
|
|
#include <linux/module.h>
|
2007-11-30 13:21:31 +00:00
|
|
|
#include <net/net_namespace.h>
|
|
|
|
#include <net/sock.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <net/sch_generic.h>
|
|
|
|
#include <net/act_api.h>
|
2007-03-26 06:06:12 +00:00
|
|
|
#include <net/netlink.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2015-07-06 12:18:04 +00:00
|
|
|
static void free_tcf(struct rcu_head *head)
|
|
|
|
{
|
|
|
|
struct tcf_common *p = container_of(head, struct tcf_common, tcfc_rcu);
|
|
|
|
|
|
|
|
free_percpu(p->cpu_bstats);
|
|
|
|
free_percpu(p->cpu_qstats);
|
|
|
|
kfree(p);
|
|
|
|
}
|
|
|
|
|
2015-08-26 03:06:31 +00:00
|
|
|
static void tcf_hash_destroy(struct tc_action *a)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-02-12 01:07:31 +00:00
|
|
|
struct tcf_common *p = a->priv;
|
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
|
|
|
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_lock_bh(&hinfo->lock);
|
|
|
|
hlist_del(&p->tcfc_head);
|
|
|
|
spin_unlock_bh(&hinfo->lock);
|
|
|
|
gen_kill_estimator(&p->tcfc_bstats,
|
|
|
|
&p->tcfc_rate_est);
|
|
|
|
/*
|
|
|
|
* gen_estimator est_timer() might access p->tcfc_lock
|
|
|
|
* or bstats, wait a RCU grace period before freeing p
|
|
|
|
*/
|
2015-07-06 12:18:04 +00:00
|
|
|
call_rcu(&p->tcfc_rcu, free_tcf);
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
int __tcf_hash_release(struct tc_action *a, bool bind, bool strict)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-02-12 01:07:31 +00:00
|
|
|
struct tcf_common *p = a->priv;
|
2006-08-22 06:54:55 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (p) {
|
|
|
|
if (bind)
|
|
|
|
p->tcfc_bindcnt--;
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
else if (strict && p->tcfc_bindcnt > 0)
|
2014-02-12 01:07:34 +00:00
|
|
|
return -EPERM;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
p->tcfc_refcnt--;
|
2007-02-09 14:25:16 +00:00
|
|
|
if (p->tcfc_bindcnt <= 0 && p->tcfc_refcnt <= 0) {
|
2014-02-12 01:07:32 +00:00
|
|
|
if (a->ops->cleanup)
|
|
|
|
a->ops->cleanup(a, bind);
|
2014-02-12 01:07:31 +00:00
|
|
|
tcf_hash_destroy(a);
|
2006-08-22 06:54:55 +00:00
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
}
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
|
2006-08-22 06:54:55 +00:00
|
|
|
return ret;
|
|
|
|
}
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
EXPORT_SYMBOL(__tcf_hash_release);
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
|
2014-01-17 19:37:02 +00:00
|
|
|
struct tc_action *a)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-01-17 19:37:02 +00:00
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
2013-12-16 04:15:09 +00:00
|
|
|
struct hlist_head *head;
|
2006-08-22 06:54:55 +00:00
|
|
|
struct tcf_common *p;
|
2011-01-19 19:26:56 +00:00
|
|
|
int err = 0, index = -1, i = 0, s_i = 0, n_i = 0;
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_lock_bh(&hinfo->lock);
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
s_i = cb->args[0];
|
|
|
|
|
|
|
|
for (i = 0; i < (hinfo->hmask + 1); i++) {
|
2013-12-16 04:15:09 +00:00
|
|
|
head = &hinfo->htab[tcf_hash(i, hinfo->hmask)];
|
2006-08-22 06:54:55 +00:00
|
|
|
|
2013-12-16 04:15:09 +00:00
|
|
|
hlist_for_each_entry_rcu(p, head, tcfc_head) {
|
2006-08-22 06:54:55 +00:00
|
|
|
index++;
|
|
|
|
if (index < s_i)
|
|
|
|
continue;
|
|
|
|
a->priv = p;
|
|
|
|
a->order = n_i;
|
2008-01-24 04:34:11 +00:00
|
|
|
|
|
|
|
nest = nla_nest_start(skb, a->order);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2006-08-22 06:54:55 +00:00
|
|
|
err = tcf_action_dump_1(skb, a, 0, 0);
|
|
|
|
if (err < 0) {
|
|
|
|
index--;
|
2008-01-24 04:34:11 +00:00
|
|
|
nlmsg_trim(skb, nest);
|
2006-08-22 06:54:55 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2006-08-22 06:54:55 +00:00
|
|
|
n_i++;
|
|
|
|
if (n_i >= TCA_ACT_MAX_PRIO)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_unlock_bh(&hinfo->lock);
|
2006-08-22 06:54:55 +00:00
|
|
|
if (n_i)
|
|
|
|
cb->args[0] += n_i;
|
|
|
|
return n_i;
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
nla_put_failure:
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_cancel(skb, nest);
|
2006-08-22 06:54:55 +00:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2014-01-17 19:37:02 +00:00
|
|
|
static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-01-17 19:37:02 +00:00
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
2013-12-16 04:15:09 +00:00
|
|
|
struct hlist_head *head;
|
|
|
|
struct hlist_node *n;
|
|
|
|
struct tcf_common *p;
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2011-01-19 19:26:56 +00:00
|
|
|
int i = 0, n_i = 0;
|
2014-02-12 01:07:34 +00:00
|
|
|
int ret = -EINVAL;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, a->order);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2012-03-29 09:11:39 +00:00
|
|
|
if (nla_put_string(skb, TCA_KIND, a->ops->kind))
|
|
|
|
goto nla_put_failure;
|
2006-08-22 06:54:55 +00:00
|
|
|
for (i = 0; i < (hinfo->hmask + 1); i++) {
|
2013-12-16 04:15:09 +00:00
|
|
|
head = &hinfo->htab[tcf_hash(i, hinfo->hmask)];
|
|
|
|
hlist_for_each_entry_safe(p, n, head, tcfc_head) {
|
2014-02-12 01:07:31 +00:00
|
|
|
a->priv = p;
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
ret = __tcf_hash_release(a, false, true);
|
2014-02-12 01:07:34 +00:00
|
|
|
if (ret == ACT_P_DELETED) {
|
2011-01-19 19:26:56 +00:00
|
|
|
module_put(a->ops->owner);
|
2013-12-23 13:02:13 +00:00
|
|
|
n_i++;
|
2014-02-12 01:07:34 +00:00
|
|
|
} else if (ret < 0)
|
|
|
|
goto nla_put_failure;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-29 09:11:39 +00:00
|
|
|
if (nla_put_u32(skb, TCA_FCNT, n_i))
|
|
|
|
goto nla_put_failure;
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
return n_i;
|
2008-01-23 06:11:50 +00:00
|
|
|
nla_put_failure:
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_cancel(skb, nest);
|
2014-02-12 01:07:34 +00:00
|
|
|
return ret;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
|
2013-12-31 19:54:00 +00:00
|
|
|
static int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
|
|
|
|
int type, struct tc_action *a)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
|
|
|
if (type == RTM_DELACTION) {
|
2014-01-17 19:37:02 +00:00
|
|
|
return tcf_del_walker(skb, a);
|
2006-08-22 06:54:55 +00:00
|
|
|
} else if (type == RTM_GETACTION) {
|
2014-01-17 19:37:02 +00:00
|
|
|
return tcf_dump_walker(skb, cb, a);
|
2006-08-22 06:54:55 +00:00
|
|
|
} else {
|
2010-05-12 06:37:05 +00:00
|
|
|
WARN(1, "tcf_generic_walker: unknown action %d\n", type);
|
2006-08-22 06:54:55 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-17 19:37:03 +00:00
|
|
|
static struct tcf_common *tcf_hash_lookup(u32 index, struct tcf_hashinfo *hinfo)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2013-12-16 04:15:09 +00:00
|
|
|
struct tcf_common *p = NULL;
|
|
|
|
struct hlist_head *head;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_lock_bh(&hinfo->lock);
|
|
|
|
head = &hinfo->htab[tcf_hash(index, hinfo->hmask)];
|
|
|
|
hlist_for_each_entry_rcu(p, head, tcfc_head)
|
2006-08-22 06:54:55 +00:00
|
|
|
if (p->tcfc_index == index)
|
|
|
|
break;
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_unlock_bh(&hinfo->lock);
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2014-01-10 00:13:59 +00:00
|
|
|
u32 tcf_hash_new_index(struct tcf_hashinfo *hinfo)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-01-10 00:13:59 +00:00
|
|
|
u32 val = hinfo->index;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
if (++val == 0)
|
|
|
|
val = 1;
|
|
|
|
} while (tcf_hash_lookup(val, hinfo));
|
|
|
|
|
2014-01-10 00:13:59 +00:00
|
|
|
hinfo->index = val;
|
2013-12-10 12:55:29 +00:00
|
|
|
return val;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(tcf_hash_new_index);
|
|
|
|
|
2014-01-17 19:37:03 +00:00
|
|
|
int tcf_hash_search(struct tc_action *a, u32 index)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
|
|
|
struct tcf_common *p = tcf_hash_lookup(index, hinfo);
|
|
|
|
|
|
|
|
if (p) {
|
|
|
|
a->priv = p;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-01-17 19:37:03 +00:00
|
|
|
EXPORT_SYMBOL(tcf_hash_search);
|
2006-08-22 06:54:55 +00:00
|
|
|
|
2014-02-12 01:07:31 +00:00
|
|
|
int tcf_hash_check(u32 index, struct tc_action *a, int bind)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-01-17 19:37:02 +00:00
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
2006-08-22 06:54:55 +00:00
|
|
|
struct tcf_common *p = NULL;
|
|
|
|
if (index && (p = tcf_hash_lookup(index, hinfo)) != NULL) {
|
2008-08-08 03:37:22 +00:00
|
|
|
if (bind)
|
2006-08-22 06:54:55 +00:00
|
|
|
p->tcfc_bindcnt++;
|
2008-08-08 03:37:22 +00:00
|
|
|
p->tcfc_refcnt++;
|
2006-08-22 06:54:55 +00:00
|
|
|
a->priv = p;
|
2014-02-12 01:07:31 +00:00
|
|
|
return 1;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
2014-02-12 01:07:31 +00:00
|
|
|
return 0;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(tcf_hash_check);
|
|
|
|
|
2014-02-12 01:07:31 +00:00
|
|
|
void tcf_hash_cleanup(struct tc_action *a, struct nlattr *est)
|
|
|
|
{
|
|
|
|
struct tcf_common *pc = a->priv;
|
|
|
|
if (est)
|
|
|
|
gen_kill_estimator(&pc->tcfc_bstats,
|
|
|
|
&pc->tcfc_rate_est);
|
2015-07-06 12:18:04 +00:00
|
|
|
call_rcu(&pc->tcfc_rcu, free_tcf);
|
2014-02-12 01:07:31 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(tcf_hash_cleanup);
|
|
|
|
|
|
|
|
int tcf_hash_create(u32 index, struct nlattr *est, struct tc_action *a,
|
2015-07-06 12:18:04 +00:00
|
|
|
int size, int bind, bool cpustats)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-01-17 19:37:02 +00:00
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
2006-08-22 06:54:55 +00:00
|
|
|
struct tcf_common *p = kzalloc(size, GFP_KERNEL);
|
2015-07-06 12:18:04 +00:00
|
|
|
int err = -ENOMEM;
|
2006-08-22 06:54:55 +00:00
|
|
|
|
|
|
|
if (unlikely(!p))
|
2014-02-12 01:07:31 +00:00
|
|
|
return -ENOMEM;
|
2006-08-22 06:54:55 +00:00
|
|
|
p->tcfc_refcnt = 1;
|
|
|
|
if (bind)
|
|
|
|
p->tcfc_bindcnt = 1;
|
|
|
|
|
2015-07-06 12:18:04 +00:00
|
|
|
if (cpustats) {
|
|
|
|
p->cpu_bstats = netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
|
|
|
|
if (!p->cpu_bstats) {
|
|
|
|
err1:
|
|
|
|
kfree(p);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
p->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
|
|
|
|
if (!p->cpu_qstats) {
|
|
|
|
err2:
|
|
|
|
free_percpu(p->cpu_bstats);
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
2006-08-22 06:54:55 +00:00
|
|
|
spin_lock_init(&p->tcfc_lock);
|
2013-12-16 04:15:09 +00:00
|
|
|
INIT_HLIST_NODE(&p->tcfc_head);
|
2014-01-10 00:13:59 +00:00
|
|
|
p->tcfc_index = index ? index : tcf_hash_new_index(hinfo);
|
2006-08-22 06:54:55 +00:00
|
|
|
p->tcfc_tm.install = jiffies;
|
|
|
|
p->tcfc_tm.lastuse = jiffies;
|
2008-11-26 05:12:32 +00:00
|
|
|
if (est) {
|
2015-07-06 12:18:04 +00:00
|
|
|
err = gen_new_estimator(&p->tcfc_bstats, p->cpu_bstats,
|
|
|
|
&p->tcfc_rate_est,
|
|
|
|
&p->tcfc_lock, est);
|
2008-11-26 05:12:32 +00:00
|
|
|
if (err) {
|
2015-07-06 12:18:04 +00:00
|
|
|
free_percpu(p->cpu_qstats);
|
|
|
|
goto err2;
|
2008-11-26 05:12:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-22 06:54:55 +00:00
|
|
|
a->priv = (void *) p;
|
2014-02-12 01:07:31 +00:00
|
|
|
return 0;
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(tcf_hash_create);
|
|
|
|
|
2014-02-12 01:07:31 +00:00
|
|
|
void tcf_hash_insert(struct tc_action *a)
|
2006-08-22 06:54:55 +00:00
|
|
|
{
|
2014-02-12 01:07:31 +00:00
|
|
|
struct tcf_common *p = a->priv;
|
|
|
|
struct tcf_hashinfo *hinfo = a->ops->hinfo;
|
2006-08-22 06:54:55 +00:00
|
|
|
unsigned int h = tcf_hash(p->tcfc_index, hinfo->hmask);
|
|
|
|
|
2013-12-16 04:15:09 +00:00
|
|
|
spin_lock_bh(&hinfo->lock);
|
|
|
|
hlist_add_head(&p->tcfc_head, &hinfo->htab[h]);
|
|
|
|
spin_unlock_bh(&hinfo->lock);
|
2006-08-22 06:54:55 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(tcf_hash_insert);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:10 +00:00
|
|
|
static LIST_HEAD(act_base);
|
2005-04-16 22:20:36 +00:00
|
|
|
static DEFINE_RWLOCK(act_mod_lock);
|
|
|
|
|
2014-02-12 01:07:33 +00:00
|
|
|
int tcf_register_action(struct tc_action_ops *act, unsigned int mask)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2013-12-16 04:15:10 +00:00
|
|
|
struct tc_action_ops *a;
|
2014-02-12 01:07:33 +00:00
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-02-12 01:07:32 +00:00
|
|
|
/* Must supply act, dump and init */
|
|
|
|
if (!act->act || !act->dump || !act->init)
|
2013-12-04 14:26:52 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2013-12-04 14:26:55 +00:00
|
|
|
/* Supply defaults */
|
2013-12-04 14:26:53 +00:00
|
|
|
if (!act->lookup)
|
|
|
|
act->lookup = tcf_hash_search;
|
2013-12-04 14:26:55 +00:00
|
|
|
if (!act->walk)
|
|
|
|
act->walk = tcf_generic_walker;
|
2013-12-04 14:26:53 +00:00
|
|
|
|
2014-02-12 01:07:33 +00:00
|
|
|
act->hinfo = kmalloc(sizeof(struct tcf_hashinfo), GFP_KERNEL);
|
|
|
|
if (!act->hinfo)
|
|
|
|
return -ENOMEM;
|
|
|
|
err = tcf_hashinfo_init(act->hinfo, mask);
|
|
|
|
if (err) {
|
|
|
|
kfree(act->hinfo);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
write_lock(&act_mod_lock);
|
2013-12-16 04:15:10 +00:00
|
|
|
list_for_each_entry(a, &act_base, head) {
|
2005-04-16 22:20:36 +00:00
|
|
|
if (act->type == a->type || (strcmp(act->kind, a->kind) == 0)) {
|
|
|
|
write_unlock(&act_mod_lock);
|
2014-02-12 01:07:33 +00:00
|
|
|
tcf_hashinfo_destroy(act->hinfo);
|
|
|
|
kfree(act->hinfo);
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EEXIST;
|
|
|
|
}
|
|
|
|
}
|
2013-12-16 04:15:10 +00:00
|
|
|
list_add_tail(&act->head, &act_base);
|
2005-04-16 22:20:36 +00:00
|
|
|
write_unlock(&act_mod_lock);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-01-23 06:10:23 +00:00
|
|
|
EXPORT_SYMBOL(tcf_register_action);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
int tcf_unregister_action(struct tc_action_ops *act)
|
|
|
|
{
|
2013-12-16 04:15:10 +00:00
|
|
|
struct tc_action_ops *a;
|
2005-04-16 22:20:36 +00:00
|
|
|
int err = -ENOENT;
|
|
|
|
|
|
|
|
write_lock(&act_mod_lock);
|
2013-12-20 20:32:32 +00:00
|
|
|
list_for_each_entry(a, &act_base, head) {
|
|
|
|
if (a == act) {
|
|
|
|
list_del(&act->head);
|
2014-02-12 01:07:33 +00:00
|
|
|
tcf_hashinfo_destroy(act->hinfo);
|
|
|
|
kfree(act->hinfo);
|
2013-12-20 20:32:32 +00:00
|
|
|
err = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
2013-12-20 20:32:32 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
write_unlock(&act_mod_lock);
|
|
|
|
return err;
|
|
|
|
}
|
2008-01-23 06:10:23 +00:00
|
|
|
EXPORT_SYMBOL(tcf_unregister_action);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* lookup by name */
|
|
|
|
static struct tc_action_ops *tc_lookup_action_n(char *kind)
|
|
|
|
{
|
2013-12-20 20:32:32 +00:00
|
|
|
struct tc_action_ops *a, *res = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (kind) {
|
|
|
|
read_lock(&act_mod_lock);
|
2013-12-16 04:15:10 +00:00
|
|
|
list_for_each_entry(a, &act_base, head) {
|
2005-04-16 22:20:36 +00:00
|
|
|
if (strcmp(kind, a->kind) == 0) {
|
2013-12-20 20:32:32 +00:00
|
|
|
if (try_module_get(a->owner))
|
|
|
|
res = a;
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
read_unlock(&act_mod_lock);
|
|
|
|
}
|
2013-12-20 20:32:32 +00:00
|
|
|
return res;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
/* lookup by nlattr */
|
|
|
|
static struct tc_action_ops *tc_lookup_action(struct nlattr *kind)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2013-12-20 20:32:32 +00:00
|
|
|
struct tc_action_ops *a, *res = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (kind) {
|
|
|
|
read_lock(&act_mod_lock);
|
2013-12-16 04:15:10 +00:00
|
|
|
list_for_each_entry(a, &act_base, head) {
|
2008-01-23 06:11:50 +00:00
|
|
|
if (nla_strcmp(kind, a->kind) == 0) {
|
2013-12-20 20:32:32 +00:00
|
|
|
if (try_module_get(a->owner))
|
|
|
|
res = a;
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
read_unlock(&act_mod_lock);
|
|
|
|
}
|
2013-12-20 20:32:32 +00:00
|
|
|
return res;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,
|
2007-02-09 14:25:16 +00:00
|
|
|
struct tcf_result *res)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-07-05 23:25:42 +00:00
|
|
|
const struct tc_action *a;
|
2005-04-16 22:20:36 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (skb->tc_verd & TC_NCLS) {
|
|
|
|
skb->tc_verd = CLR_TC_NCLS(skb->tc_verd);
|
|
|
|
ret = TC_ACT_OK;
|
|
|
|
goto exec_done;
|
|
|
|
}
|
2013-12-16 04:15:05 +00:00
|
|
|
list_for_each_entry(a, actions, list) {
|
2005-04-16 22:20:36 +00:00
|
|
|
repeat:
|
2013-12-23 13:02:12 +00:00
|
|
|
ret = a->ops->act(skb, a, res);
|
|
|
|
if (ret == TC_ACT_REPEAT)
|
|
|
|
goto repeat; /* we need a ttl - JHS */
|
|
|
|
if (ret != TC_ACT_PIPE)
|
|
|
|
goto exec_done;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
exec_done:
|
|
|
|
return ret;
|
|
|
|
}
|
2008-01-23 06:10:23 +00:00
|
|
|
EXPORT_SYMBOL(tcf_action_exec);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-02-12 01:07:34 +00:00
|
|
|
int tcf_action_destroy(struct list_head *actions, int bind)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2013-12-16 04:15:05 +00:00
|
|
|
struct tc_action *a, *tmp;
|
2014-02-12 01:07:34 +00:00
|
|
|
int ret = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
list_for_each_entry_safe(a, tmp, actions, list) {
|
net: sched: fix refcount imbalance in actions
Since commit 55334a5db5cd ("net_sched: act: refuse to remove bound action
outside"), we end up with a wrong reference count for a tc action.
Test case 1:
FOO="1,6 0 0 4294967295,"
BAR="1,6 0 0 4294967294,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 \
action bpf bytecode "$FOO"
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 1 bind 1
tc actions replace action bpf bytecode "$BAR" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967294' default-action pipe
index 1 ref 2 bind 1
tc actions replace action bpf bytecode "$FOO" index 1
tc actions show action bpf
action order 0: bpf bytecode '1,6 0 0 4294967295' default-action pipe
index 1 ref 3 bind 1
Test case 2:
FOO="1,6 0 0 4294967295,"
tc filter add dev foo parent 1: bpf bytecode "$FOO" flowid 1:1 action ok
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 1 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 2 bind 1
tc actions add action drop index 1
RTNETLINK answers: File exists [...]
tc actions show action gact
action order 0: gact action pass
random type none pass val 0
index 1 ref 3 bind 1
What happens is that in tcf_hash_check(), we check tcf_common for a given
index and increase tcfc_refcnt and conditionally tcfc_bindcnt when we've
found an existing action. Now there are the following cases:
1) We do a late binding of an action. In that case, we leave the
tcfc_refcnt/tcfc_bindcnt increased and are done with the ->init()
handler. This is correctly handeled.
2) We replace the given action, or we try to add one without replacing
and find out that the action at a specific index already exists
(thus, we go out with error in that case).
In case of 2), we have to undo the reference count increase from
tcf_hash_check() in the tcf_hash_check() function. Currently, we fail to
do so because of the 'tcfc_bindcnt > 0' check which bails out early with
an -EPERM error.
Now, while commit 55334a5db5cd prevents 'tc actions del action ...' on an
already classifier-bound action to drop the reference count (which could
then become negative, wrap around etc), this restriction only accounts for
invocations outside a specific action's ->init() handler.
One possible solution would be to add a flag thus we possibly trigger
the -EPERM ony in situations where it is indeed relevant.
After the patch, above test cases have correct reference count again.
Fixes: 55334a5db5cd ("net_sched: act: refuse to remove bound action outside")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-29 21:35:25 +00:00
|
|
|
ret = __tcf_hash_release(a, bind, true);
|
2014-02-12 01:07:34 +00:00
|
|
|
if (ret == ACT_P_DELETED)
|
2013-12-23 13:02:12 +00:00
|
|
|
module_put(a->ops->owner);
|
2014-02-12 01:07:34 +00:00
|
|
|
else if (ret < 0)
|
|
|
|
return ret;
|
2013-12-23 13:02:12 +00:00
|
|
|
list_del(&a->list);
|
|
|
|
kfree(a);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2014-02-12 01:07:34 +00:00
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
|
|
|
|
{
|
|
|
|
return a->ops->dump(skb, a, bind, ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
|
|
|
|
{
|
|
|
|
int err = -EINVAL;
|
2007-04-20 03:29:13 +00:00
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-03-29 09:11:39 +00:00
|
|
|
if (nla_put_string(skb, TCA_KIND, a->ops->kind))
|
|
|
|
goto nla_put_failure;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (tcf_action_copy_stats(skb, a, 0))
|
2008-01-23 06:11:50 +00:00
|
|
|
goto nla_put_failure;
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, TCA_OPTIONS);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2011-01-19 19:26:56 +00:00
|
|
|
err = tcf_action_dump_old(skb, a, bind, ref);
|
|
|
|
if (err > 0) {
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2005-04-16 22:20:36 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
nla_put_failure:
|
2007-03-26 06:06:12 +00:00
|
|
|
nlmsg_trim(skb, b);
|
2005-04-16 22:20:36 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2008-01-23 06:10:23 +00:00
|
|
|
EXPORT_SYMBOL(tcf_action_dump_1);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
int
|
2013-12-16 04:15:05 +00:00
|
|
|
tcf_action_dump(struct sk_buff *skb, struct list_head *actions, int bind, int ref)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct tc_action *a;
|
|
|
|
int err = -EINVAL;
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
list_for_each_entry(a, actions, list) {
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, a->order);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2005-04-16 22:20:36 +00:00
|
|
|
err = tcf_action_dump_1(skb, a, bind, ref);
|
|
|
|
if (err < 0)
|
2006-07-06 03:47:28 +00:00
|
|
|
goto errout;
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
nla_put_failure:
|
2006-07-06 03:47:28 +00:00
|
|
|
err = -EINVAL;
|
|
|
|
errout:
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_cancel(skb, nest);
|
2006-07-06 03:47:28 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2013-01-14 05:15:39 +00:00
|
|
|
struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
|
|
|
|
struct nlattr *est, char *name, int ovr,
|
|
|
|
int bind)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct tc_action *a;
|
|
|
|
struct tc_action_ops *a_o;
|
|
|
|
char act_name[IFNAMSIZ];
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX + 1];
|
2008-01-23 06:11:50 +00:00
|
|
|
struct nlattr *kind;
|
2008-01-24 04:33:13 +00:00
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (name == NULL) {
|
2008-01-24 04:33:32 +00:00
|
|
|
err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL);
|
|
|
|
if (err < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_out;
|
2008-01-24 04:33:32 +00:00
|
|
|
err = -EINVAL;
|
2008-01-23 06:11:50 +00:00
|
|
|
kind = tb[TCA_ACT_KIND];
|
2005-04-16 22:20:36 +00:00
|
|
|
if (kind == NULL)
|
|
|
|
goto err_out;
|
2008-01-23 06:11:50 +00:00
|
|
|
if (nla_strlcpy(act_name, kind, IFNAMSIZ) >= IFNAMSIZ)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_out;
|
|
|
|
} else {
|
2008-01-24 04:33:32 +00:00
|
|
|
err = -EINVAL;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (strlcpy(act_name, name, IFNAMSIZ) >= IFNAMSIZ)
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
a_o = tc_lookup_action_n(act_name);
|
|
|
|
if (a_o == NULL) {
|
2008-10-16 22:24:51 +00:00
|
|
|
#ifdef CONFIG_MODULES
|
2005-04-16 22:20:36 +00:00
|
|
|
rtnl_unlock();
|
2006-01-09 06:22:14 +00:00
|
|
|
request_module("act_%s", act_name);
|
2005-04-16 22:20:36 +00:00
|
|
|
rtnl_lock();
|
|
|
|
|
|
|
|
a_o = tc_lookup_action_n(act_name);
|
|
|
|
|
|
|
|
/* We dropped the RTNL semaphore in order to
|
|
|
|
* perform the module load. So, even if we
|
|
|
|
* succeeded in loading the module we have to
|
|
|
|
* tell the caller to replay the request. We
|
|
|
|
* indicate this using -EAGAIN.
|
|
|
|
*/
|
|
|
|
if (a_o != NULL) {
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -EAGAIN;
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_mod;
|
|
|
|
}
|
|
|
|
#endif
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -ENOENT;
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -ENOMEM;
|
2006-07-21 21:51:30 +00:00
|
|
|
a = kzalloc(sizeof(*a), GFP_KERNEL);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (a == NULL)
|
|
|
|
goto err_mod;
|
|
|
|
|
2014-01-17 19:37:02 +00:00
|
|
|
a->ops = a_o;
|
2013-12-16 04:15:05 +00:00
|
|
|
INIT_LIST_HEAD(&a->list);
|
2005-04-16 22:20:36 +00:00
|
|
|
/* backward compatibility for policer */
|
|
|
|
if (name == NULL)
|
2013-01-14 05:15:39 +00:00
|
|
|
err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, a, ovr, bind);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
2013-01-14 05:15:39 +00:00
|
|
|
err = a_o->init(net, nla, est, a, ovr, bind);
|
2008-01-24 04:33:13 +00:00
|
|
|
if (err < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_free;
|
|
|
|
|
|
|
|
/* module count goes up only when brand new policy is created
|
2011-01-19 19:26:56 +00:00
|
|
|
* if it exists and is only bound to in a_o->init() then
|
|
|
|
* ACT_P_CREATED is not returned (a zero is).
|
|
|
|
*/
|
2008-01-24 04:33:13 +00:00
|
|
|
if (err != ACT_P_CREATED)
|
2005-04-16 22:20:36 +00:00
|
|
|
module_put(a_o->owner);
|
|
|
|
|
|
|
|
return a;
|
|
|
|
|
|
|
|
err_free:
|
|
|
|
kfree(a);
|
|
|
|
err_mod:
|
|
|
|
module_put(a_o->owner);
|
|
|
|
err_out:
|
2008-01-24 04:33:13 +00:00
|
|
|
return ERR_PTR(err);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
int tcf_action_init(struct net *net, struct nlattr *nla,
|
2013-01-14 05:15:39 +00:00
|
|
|
struct nlattr *est, char *name, int ovr,
|
2013-12-16 04:15:05 +00:00
|
|
|
int bind, struct list_head *actions)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
|
2013-12-16 04:15:05 +00:00
|
|
|
struct tc_action *act;
|
2008-01-24 04:33:32 +00:00
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
int i;
|
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
err = nla_parse_nested(tb, TCA_ACT_MAX_PRIO, nla, NULL);
|
|
|
|
if (err < 0)
|
2013-12-16 04:15:05 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {
|
2013-01-14 05:15:39 +00:00
|
|
|
act = tcf_action_init_1(net, tb[i], est, name, ovr, bind);
|
2013-12-16 04:15:05 +00:00
|
|
|
if (IS_ERR(act)) {
|
|
|
|
err = PTR_ERR(act);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err;
|
2013-12-16 04:15:05 +00:00
|
|
|
}
|
2008-01-23 06:11:50 +00:00
|
|
|
act->order = i;
|
2013-12-16 04:15:05 +00:00
|
|
|
list_add_tail(&act->list, actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2013-12-16 04:15:05 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
err:
|
2013-12-16 04:15:05 +00:00
|
|
|
tcf_action_destroy(actions, bind);
|
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
|
|
|
|
int compat_mode)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
struct gnet_dump d;
|
2014-01-10 00:14:05 +00:00
|
|
|
struct tcf_common *p = a->priv;
|
2007-02-09 14:25:16 +00:00
|
|
|
|
2014-01-10 00:14:05 +00:00
|
|
|
if (p == NULL)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto errout;
|
|
|
|
|
|
|
|
/* compat_mode being true specifies a call that is supposed
|
2009-09-29 01:43:57 +00:00
|
|
|
* to add additional backward compatibility statistic TLVs.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
if (compat_mode) {
|
|
|
|
if (a->type == TCA_OLD_COMPAT)
|
|
|
|
err = gnet_stats_start_copy_compat(skb, 0,
|
2014-01-10 00:14:05 +00:00
|
|
|
TCA_STATS, TCA_XSTATS, &p->tcfc_lock, &d);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
} else
|
|
|
|
err = gnet_stats_start_copy(skb, TCA_ACT_STATS,
|
2014-01-10 00:14:05 +00:00
|
|
|
&p->tcfc_lock, &d);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (err < 0)
|
|
|
|
goto errout;
|
|
|
|
|
2015-07-06 12:18:04 +00:00
|
|
|
if (gnet_stats_copy_basic(&d, p->cpu_bstats, &p->tcfc_bstats) < 0 ||
|
2014-01-10 00:14:05 +00:00
|
|
|
gnet_stats_copy_rate_est(&d, &p->tcfc_bstats,
|
|
|
|
&p->tcfc_rate_est) < 0 ||
|
2015-07-06 12:18:04 +00:00
|
|
|
gnet_stats_copy_queue(&d, p->cpu_qstats,
|
2014-09-28 18:53:57 +00:00
|
|
|
&p->tcfc_qstats,
|
|
|
|
p->tcfc_qstats.qlen) < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto errout;
|
|
|
|
|
|
|
|
if (gnet_stats_finish_copy(&d) < 0)
|
|
|
|
goto errout;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
errout:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-12-16 04:15:05 +00:00
|
|
|
tca_get_fill(struct sk_buff *skb, struct list_head *actions, u32 portid, u32 seq,
|
2007-02-09 14:25:16 +00:00
|
|
|
u16 flags, int event, int bind, int ref)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct tcamsg *t;
|
|
|
|
struct nlmsghdr *nlh;
|
2007-04-20 03:29:13 +00:00
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-09-07 20:12:54 +00:00
|
|
|
nlh = nlmsg_put(skb, portid, seq, event, sizeof(*t), flags);
|
2012-06-27 04:39:32 +00:00
|
|
|
if (!nlh)
|
|
|
|
goto out_nlmsg_trim;
|
|
|
|
t = nlmsg_data(nlh);
|
2005-04-16 22:20:36 +00:00
|
|
|
t->tca_family = AF_UNSPEC;
|
2005-06-28 19:55:30 +00:00
|
|
|
t->tca__pad1 = 0;
|
|
|
|
t->tca__pad2 = 0;
|
2007-02-09 14:25:16 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, TCA_ACT_TAB);
|
|
|
|
if (nest == NULL)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_nlmsg_trim;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
if (tcf_action_dump(skb, actions, bind, ref) < 0)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_nlmsg_trim;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2007-02-09 14:25:16 +00:00
|
|
|
|
2007-04-20 03:29:13 +00:00
|
|
|
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
|
2005-04-16 22:20:36 +00:00
|
|
|
return skb->len;
|
|
|
|
|
2012-06-27 04:39:32 +00:00
|
|
|
out_nlmsg_trim:
|
2007-03-26 06:06:12 +00:00
|
|
|
nlmsg_trim(skb, b);
|
2005-04-16 22:20:36 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-09-07 20:12:54 +00:00
|
|
|
act_get_notify(struct net *net, u32 portid, struct nlmsghdr *n,
|
2013-12-16 04:15:05 +00:00
|
|
|
struct list_head *actions, int event)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
|
|
|
|
if (!skb)
|
|
|
|
return -ENOBUFS;
|
2013-12-16 04:15:05 +00:00
|
|
|
if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, 0, event, 0, 0) <= 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
kfree_skb(skb);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2006-08-15 07:30:25 +00:00
|
|
|
|
2012-09-07 20:12:54 +00:00
|
|
|
return rtnl_unicast(skb, net, portid);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2014-02-12 01:07:35 +00:00
|
|
|
static struct tc_action *create_a(int i)
|
|
|
|
{
|
|
|
|
struct tc_action *act;
|
|
|
|
|
|
|
|
act = kzalloc(sizeof(*act), GFP_KERNEL);
|
|
|
|
if (act == NULL) {
|
|
|
|
pr_debug("create_a: failed to alloc!\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
act->order = i;
|
|
|
|
INIT_LIST_HEAD(&act->list);
|
|
|
|
return act;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static struct tc_action *
|
2012-09-07 20:12:54 +00:00
|
|
|
tcf_action_get_1(struct nlattr *nla, struct nlmsghdr *n, u32 portid)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX + 1];
|
2005-04-16 22:20:36 +00:00
|
|
|
struct tc_action *a;
|
|
|
|
int index;
|
2008-01-24 04:33:13 +00:00
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL);
|
|
|
|
if (err < 0)
|
2008-01-24 04:33:13 +00:00
|
|
|
goto err_out;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
err = -EINVAL;
|
2008-01-23 06:11:50 +00:00
|
|
|
if (tb[TCA_ACT_INDEX] == NULL ||
|
|
|
|
nla_len(tb[TCA_ACT_INDEX]) < sizeof(index))
|
2008-01-24 04:33:13 +00:00
|
|
|
goto err_out;
|
2008-01-24 04:35:03 +00:00
|
|
|
index = nla_get_u32(tb[TCA_ACT_INDEX]);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -ENOMEM;
|
2014-02-12 01:07:35 +00:00
|
|
|
a = create_a(0);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (a == NULL)
|
2008-01-24 04:33:13 +00:00
|
|
|
goto err_out;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -EINVAL;
|
2008-01-23 06:11:50 +00:00
|
|
|
a->ops = tc_lookup_action(tb[TCA_ACT_KIND]);
|
2013-12-23 13:02:12 +00:00
|
|
|
if (a->ops == NULL) /* could happen in batch of actions */
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_free;
|
2008-01-24 04:33:13 +00:00
|
|
|
err = -ENOENT;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (a->ops->lookup(a, index) == 0)
|
|
|
|
goto err_mod;
|
|
|
|
|
|
|
|
module_put(a->ops->owner);
|
|
|
|
return a;
|
2008-01-24 04:33:13 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
err_mod:
|
|
|
|
module_put(a->ops->owner);
|
|
|
|
err_free:
|
|
|
|
kfree(a);
|
2008-01-24 04:33:13 +00:00
|
|
|
err_out:
|
|
|
|
return ERR_PTR(err);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
static void cleanup_a(struct list_head *actions)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2013-12-16 04:15:05 +00:00
|
|
|
struct tc_action *a, *tmp;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
list_for_each_entry_safe(a, tmp, actions, list) {
|
|
|
|
list_del(&a->list);
|
2005-04-16 22:20:36 +00:00
|
|
|
kfree(a);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-19 15:40:13 +00:00
|
|
|
static int tca_action_flush(struct net *net, struct nlattr *nla,
|
2012-09-07 20:12:54 +00:00
|
|
|
struct nlmsghdr *n, u32 portid)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
unsigned char *b;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
struct tcamsg *t;
|
|
|
|
struct netlink_callback dcb;
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX + 1];
|
2008-01-23 06:11:50 +00:00
|
|
|
struct nlattr *kind;
|
2014-02-12 01:07:35 +00:00
|
|
|
struct tc_action a;
|
2008-08-13 09:41:45 +00:00
|
|
|
int err = -ENOMEM;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
|
|
|
|
if (!skb) {
|
2010-05-12 06:37:05 +00:00
|
|
|
pr_debug("tca_action_flush: failed skb alloc\n");
|
2008-08-13 09:41:45 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-20 03:29:13 +00:00
|
|
|
b = skb_tail_pointer(skb);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL);
|
|
|
|
if (err < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_out;
|
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
err = -EINVAL;
|
2008-01-23 06:11:50 +00:00
|
|
|
kind = tb[TCA_ACT_KIND];
|
2014-02-12 01:07:35 +00:00
|
|
|
memset(&a, 0, sizeof(struct tc_action));
|
|
|
|
INIT_LIST_HEAD(&a.list);
|
|
|
|
a.ops = tc_lookup_action(kind);
|
|
|
|
if (a.ops == NULL) /*some idjot trying to flush unknown action */
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_out;
|
|
|
|
|
2012-09-07 20:12:54 +00:00
|
|
|
nlh = nlmsg_put(skb, portid, n->nlmsg_seq, RTM_DELACTION, sizeof(*t), 0);
|
2012-06-27 04:39:32 +00:00
|
|
|
if (!nlh)
|
|
|
|
goto out_module_put;
|
|
|
|
t = nlmsg_data(nlh);
|
2005-04-16 22:20:36 +00:00
|
|
|
t->tca_family = AF_UNSPEC;
|
2005-06-28 19:55:30 +00:00
|
|
|
t->tca__pad1 = 0;
|
|
|
|
t->tca__pad2 = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, TCA_ACT_TAB);
|
|
|
|
if (nest == NULL)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_module_put;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-02-12 01:07:35 +00:00
|
|
|
err = a.ops->walk(skb, &dcb, RTM_DELACTION, &a);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (err < 0)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_module_put;
|
2008-08-13 09:41:22 +00:00
|
|
|
if (err == 0)
|
|
|
|
goto noflush_out;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-04-20 03:29:13 +00:00
|
|
|
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
|
2005-04-16 22:20:36 +00:00
|
|
|
nlh->nlmsg_flags |= NLM_F_ROOT;
|
2014-02-12 01:07:35 +00:00
|
|
|
module_put(a.ops->owner);
|
2012-09-07 20:12:54 +00:00
|
|
|
err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
|
2011-01-19 19:26:56 +00:00
|
|
|
n->nlmsg_flags & NLM_F_ECHO);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (err > 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
2012-06-27 04:39:32 +00:00
|
|
|
out_module_put:
|
2014-02-12 01:07:35 +00:00
|
|
|
module_put(a.ops->owner);
|
2005-04-16 22:20:36 +00:00
|
|
|
err_out:
|
2008-08-13 09:41:22 +00:00
|
|
|
noflush_out:
|
2005-04-16 22:20:36 +00:00
|
|
|
kfree_skb(skb);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-01-10 00:14:00 +00:00
|
|
|
static int
|
|
|
|
tcf_del_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,
|
|
|
|
u32 portid)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
|
|
|
|
if (!skb)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, 0, RTM_DELACTION,
|
|
|
|
0, 1) <= 0) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now do the delete */
|
2014-02-12 01:07:34 +00:00
|
|
|
ret = tcf_action_destroy(actions, 0);
|
|
|
|
if (ret < 0) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return ret;
|
|
|
|
}
|
2014-01-10 00:14:00 +00:00
|
|
|
|
|
|
|
ret = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
|
|
|
|
n->nlmsg_flags & NLM_F_ECHO);
|
|
|
|
if (ret > 0)
|
|
|
|
return 0;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static int
|
2010-03-19 15:40:13 +00:00
|
|
|
tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
|
2012-09-07 20:12:54 +00:00
|
|
|
u32 portid, int event)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-24 04:33:32 +00:00
|
|
|
int i, ret;
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
|
2013-12-16 04:15:05 +00:00
|
|
|
struct tc_action *act;
|
|
|
|
LIST_HEAD(actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:33:32 +00:00
|
|
|
ret = nla_parse_nested(tb, TCA_ACT_MAX_PRIO, nla, NULL);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-01-19 19:26:56 +00:00
|
|
|
if (event == RTM_DELACTION && n->nlmsg_flags & NLM_F_ROOT) {
|
2008-08-13 09:41:22 +00:00
|
|
|
if (tb[1] != NULL)
|
2012-09-07 20:12:54 +00:00
|
|
|
return tca_action_flush(net, tb[1], n, portid);
|
2008-08-13 09:41:22 +00:00
|
|
|
else
|
|
|
|
return -EINVAL;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {
|
2012-09-07 20:12:54 +00:00
|
|
|
act = tcf_action_get_1(tb[i], n, portid);
|
2008-01-24 04:33:13 +00:00
|
|
|
if (IS_ERR(act)) {
|
|
|
|
ret = PTR_ERR(act);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err;
|
2008-01-24 04:33:13 +00:00
|
|
|
}
|
2008-01-23 06:11:50 +00:00
|
|
|
act->order = i;
|
2013-12-16 04:15:05 +00:00
|
|
|
list_add_tail(&act->list, &actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (event == RTM_GETACTION)
|
2013-12-16 04:15:05 +00:00
|
|
|
ret = act_get_notify(net, portid, n, &actions, event);
|
2005-04-16 22:20:36 +00:00
|
|
|
else { /* delete */
|
2014-01-10 00:14:00 +00:00
|
|
|
ret = tcf_del_notify(net, n, &actions, portid);
|
|
|
|
if (ret)
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
err:
|
2013-12-16 04:15:05 +00:00
|
|
|
cleanup_a(&actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-01-10 00:14:00 +00:00
|
|
|
static int
|
|
|
|
tcf_add_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,
|
|
|
|
u32 portid)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
|
|
|
|
if (!skb)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
2014-01-10 00:14:00 +00:00
|
|
|
if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, n->nlmsg_flags,
|
|
|
|
RTM_NEWACTION, 0, 0) <= 0) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2007-02-09 14:25:16 +00:00
|
|
|
|
2014-01-10 00:14:00 +00:00
|
|
|
err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
|
|
|
|
n->nlmsg_flags & NLM_F_ECHO);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (err > 0)
|
|
|
|
err = 0;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2010-03-19 15:40:13 +00:00
|
|
|
tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
|
2012-09-07 20:12:54 +00:00
|
|
|
u32 portid, int ovr)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
2013-12-16 04:15:05 +00:00
|
|
|
LIST_HEAD(actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-12-16 04:15:05 +00:00
|
|
|
ret = tcf_action_init(net, nla, NULL, NULL, ovr, 0, &actions);
|
|
|
|
if (ret)
|
2008-01-24 04:33:13 +00:00
|
|
|
goto done;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* dump then free all the actions after update; inserted policy
|
|
|
|
* stays intact
|
2011-01-19 19:26:56 +00:00
|
|
|
*/
|
2014-01-10 00:14:00 +00:00
|
|
|
ret = tcf_add_notify(net, n, &actions, portid);
|
2013-12-16 04:15:05 +00:00
|
|
|
cleanup_a(&actions);
|
2005-04-16 22:20:36 +00:00
|
|
|
done:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-03-21 07:45:29 +00:00
|
|
|
static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-03-25 17:26:21 +00:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2008-01-23 06:11:50 +00:00
|
|
|
struct nlattr *tca[TCA_ACT_MAX + 1];
|
2012-09-07 20:12:54 +00:00
|
|
|
u32 portid = skb ? NETLINK_CB(skb).portid : 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
int ret = 0, ovr = 0;
|
|
|
|
|
2014-04-23 21:29:27 +00:00
|
|
|
if ((n->nlmsg_type != RTM_GETACTION) && !netlink_capable(skb, CAP_NET_ADMIN))
|
2012-11-16 03:03:00 +00:00
|
|
|
return -EPERM;
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ACT_MAX, NULL);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (tca[TCA_ACT_TAB] == NULL) {
|
2010-05-12 06:37:05 +00:00
|
|
|
pr_notice("tc_ctl_action: received NO action attribs\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2011-01-19 19:26:56 +00:00
|
|
|
/* n->nlmsg_flags & NLM_F_CREATE */
|
2005-04-16 22:20:36 +00:00
|
|
|
switch (n->nlmsg_type) {
|
|
|
|
case RTM_NEWACTION:
|
|
|
|
/* we are going to assume all other flags
|
2011-03-31 01:57:33 +00:00
|
|
|
* imply create only if it doesn't exist
|
2005-04-16 22:20:36 +00:00
|
|
|
* Note that CREATE | EXCL implies that
|
|
|
|
* but since we want avoid ambiguity (eg when flags
|
|
|
|
* is zero) then just set this
|
|
|
|
*/
|
2011-01-19 19:26:56 +00:00
|
|
|
if (n->nlmsg_flags & NLM_F_REPLACE)
|
2005-04-16 22:20:36 +00:00
|
|
|
ovr = 1;
|
|
|
|
replay:
|
2012-09-07 20:12:54 +00:00
|
|
|
ret = tcf_action_add(net, tca[TCA_ACT_TAB], n, portid, ovr);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (ret == -EAGAIN)
|
|
|
|
goto replay;
|
|
|
|
break;
|
|
|
|
case RTM_DELACTION:
|
2010-03-19 15:40:13 +00:00
|
|
|
ret = tca_action_gd(net, tca[TCA_ACT_TAB], n,
|
2012-09-07 20:12:54 +00:00
|
|
|
portid, RTM_DELACTION);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
case RTM_GETACTION:
|
2010-03-19 15:40:13 +00:00
|
|
|
ret = tca_action_gd(net, tca[TCA_ACT_TAB], n,
|
2012-09-07 20:12:54 +00:00
|
|
|
portid, RTM_GETACTION);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
static struct nlattr *
|
2009-08-25 14:07:40 +00:00
|
|
|
find_dump_kind(const struct nlmsghdr *n)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-01-19 19:26:56 +00:00
|
|
|
struct nlattr *tb1, *tb2[TCA_ACT_MAX + 1];
|
2008-01-23 06:11:50 +00:00
|
|
|
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
|
|
|
|
struct nlattr *nla[TCAA_MAX + 1];
|
|
|
|
struct nlattr *kind;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:32:58 +00:00
|
|
|
if (nlmsg_parse(n, sizeof(struct tcamsg), nla, TCAA_MAX, NULL) < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
return NULL;
|
2008-01-23 06:11:50 +00:00
|
|
|
tb1 = nla[TCA_ACT_TAB];
|
2005-04-16 22:20:36 +00:00
|
|
|
if (tb1 == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2008-01-23 06:11:50 +00:00
|
|
|
if (nla_parse(tb, TCA_ACT_MAX_PRIO, nla_data(tb1),
|
|
|
|
NLMSG_ALIGN(nla_len(tb1)), NULL) < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
return NULL;
|
|
|
|
|
2008-01-24 04:32:42 +00:00
|
|
|
if (tb[1] == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (nla_parse(tb2, TCA_ACT_MAX, nla_data(tb[1]),
|
|
|
|
nla_len(tb[1]), NULL) < 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
return NULL;
|
2008-01-23 06:11:50 +00:00
|
|
|
kind = tb2[TCA_ACT_KIND];
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-07-06 03:45:06 +00:00
|
|
|
return kind;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
|
|
|
|
{
|
|
|
|
struct nlmsghdr *nlh;
|
2007-04-20 03:29:13 +00:00
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2008-01-24 04:34:11 +00:00
|
|
|
struct nlattr *nest;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct tc_action_ops *a_o;
|
|
|
|
struct tc_action a;
|
|
|
|
int ret = 0;
|
2012-06-27 04:39:32 +00:00
|
|
|
struct tcamsg *t = (struct tcamsg *) nlmsg_data(cb->nlh);
|
2008-01-23 06:11:50 +00:00
|
|
|
struct nlattr *kind = find_dump_kind(cb->nlh);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (kind == NULL) {
|
2010-05-12 06:37:05 +00:00
|
|
|
pr_info("tc_dump_action: action bad kind\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-06 03:45:06 +00:00
|
|
|
a_o = tc_lookup_action(kind);
|
2011-01-19 19:26:56 +00:00
|
|
|
if (a_o == NULL)
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
memset(&a, 0, sizeof(struct tc_action));
|
|
|
|
a.ops = a_o;
|
|
|
|
|
2012-09-07 20:12:54 +00:00
|
|
|
nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
|
2012-06-27 04:39:32 +00:00
|
|
|
cb->nlh->nlmsg_type, sizeof(*t), 0);
|
|
|
|
if (!nlh)
|
|
|
|
goto out_module_put;
|
|
|
|
t = nlmsg_data(nlh);
|
2005-04-16 22:20:36 +00:00
|
|
|
t->tca_family = AF_UNSPEC;
|
2005-06-28 19:55:30 +00:00
|
|
|
t->tca__pad1 = 0;
|
|
|
|
t->tca__pad2 = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-24 04:34:11 +00:00
|
|
|
nest = nla_nest_start(skb, TCA_ACT_TAB);
|
|
|
|
if (nest == NULL)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_module_put;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
ret = a_o->walk(skb, cb, RTM_GETACTION, &a);
|
|
|
|
if (ret < 0)
|
2012-06-27 04:39:32 +00:00
|
|
|
goto out_module_put;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (ret > 0) {
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_end(skb, nest);
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = skb->len;
|
|
|
|
} else
|
2008-01-24 04:34:11 +00:00
|
|
|
nla_nest_cancel(skb, nest);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-04-20 03:29:13 +00:00
|
|
|
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
|
2012-09-07 20:12:54 +00:00
|
|
|
if (NETLINK_CB(cb->skb).portid && ret)
|
2005-04-16 22:20:36 +00:00
|
|
|
nlh->nlmsg_flags |= NLM_F_MULTI;
|
|
|
|
module_put(a_o->owner);
|
|
|
|
return skb->len;
|
|
|
|
|
2012-06-27 04:39:32 +00:00
|
|
|
out_module_put:
|
2005-04-16 22:20:36 +00:00
|
|
|
module_put(a_o->owner);
|
2007-03-26 06:06:12 +00:00
|
|
|
nlmsg_trim(skb, b);
|
2005-04-16 22:20:36 +00:00
|
|
|
return skb->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init tc_action_init(void)
|
|
|
|
{
|
2011-06-10 01:27:09 +00:00
|
|
|
rtnl_register(PF_UNSPEC, RTM_NEWACTION, tc_ctl_action, NULL, NULL);
|
|
|
|
rtnl_register(PF_UNSPEC, RTM_DELACTION, tc_ctl_action, NULL, NULL);
|
|
|
|
rtnl_register(PF_UNSPEC, RTM_GETACTION, tc_ctl_action, tc_dump_action,
|
|
|
|
NULL);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
subsys_initcall(tc_action_init);
|