diff options
| author |   Davide Caratti <dcaratti@redhat.com> | 2018-06-19 15:45:50 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-06-20 09:03:58 +0900 |
| commit | cbf56c29624fa056a0c1c3d177e67aa51a7fd8d6 (patch) | |
| tree | 7126a4b3da3a1044997a1e258395a71080cc7dd4 /net | |
| parent | net/sched: act_ife: fix recursive lock and idr leak (diff) | |
| download | linux-dev-cbf56c29624fa056a0c1c3d177e67aa51a7fd8d6.tar.xz linux-dev-cbf56c29624fa056a0c1c3d177e67aa51a7fd8d6.zip | |
net/sched: act_ife: preserve the action control in case of error
in the following script
# tc actions add action ife encode allow prio pass index 42
# tc actions replace action ife encode allow tcindex drop index 42
the action control should remain equal to 'pass', if the kernel failed
to replace the TC action. Pospone the assignment of the action control,
to ensure it is not overwritten in the error path of tcf_ife_init().
Fixes: ef6980b6becb ("introduce IFE action")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_ife.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 078d52212172..20d7d36b2fc9 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -517,8 +517,6 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, saddr = nla_data(tb[TCA_IFE_SMAC]); } - ife->tcf_action = parm->action; - if (parm->flags & IFE_ENCODE) { if (daddr) ether_addr_copy(p->eth_dst, daddr); @@ -575,6 +573,7 @@ metadata_parse_err: } } + ife->tcf_action = parm->action; if (exists) spin_unlock_bh(&ife->tcf_lock); |