diff options
| author |   Dmytro Linkin <dmitrolin@mellanox.com> | 2019-08-01 13:02:51 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-05 10:59:14 -0700 |
| commit | 7be8ef2cdbfe41a2e524b7c6cc3f8e6cfaa906e4 (patch) | |
| tree | 42b36459934917001e8ed83595d238924120b3c9 /net/sched/act_connmark.c | |
| parent | net: dsa: mv88e6xxx: drop adjust_link to enabled phylink (diff) | |
| download | linux-dev-7be8ef2cdbfe41a2e524b7c6cc3f8e6cfaa906e4.tar.xz linux-dev-7be8ef2cdbfe41a2e524b7c6cc3f8e6cfaa906e4.zip | |
net: sched: use temporary variable for actions indexes
Currently init call of all actions (except ipt) init their 'parm'
structure as a direct pointer to nla data in skb. This leads to race
condition when some of the filter actions were initialized successfully
(and were assigned with idr action index that was written directly
into nla data), but then were deleted and retried (due to following
action module missing or classifier-initiated retry), in which case
action init code tries to insert action to idr with index that was
assigned on previous iteration. During retry the index can be reused
by another action that was inserted concurrently, which causes
unintended action sharing between filters.
To fix described race condition, save action idr index to temporary
stack-allocated variable instead on nla data.
Fixes: 0190c1d452a9 ("net: sched: atomically check-allocate action")
Signed-off-by: Dmytro Linkin <dmitrolin@mellanox.com>
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_connmark.c')
| -rw-r--r-- | net/sched/act_connmark.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index ce36b0f7e1dc..32ac04d77a45 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -103,6 +103,7 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla, struct tcf_connmark_info *ci; struct tc_connmark *parm; int ret = 0, err; + u32 index; if (!nla) return -EINVAL; @@ -116,13 +117,13 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla, return -EINVAL; parm = nla_data(tb[TCA_CONNMARK_PARMS]); - - ret = tcf_idr_check_alloc(tn, &parm->index, a, bind); + index = parm->index; + ret = tcf_idr_check_alloc(tn, &index, a, bind); if (!ret) { - ret = tcf_idr_create(tn, parm->index, est, a, + ret = tcf_idr_create(tn, index, est, a, &act_connmark_ops, bind, false); if (ret) { - tcf_idr_cleanup(tn, parm->index); + tcf_idr_cleanup(tn, index); return ret; } |