| Message ID | 717d0682de4fb24ed6818f2bf264202d22e1e8be.1529415179.git.dcaratti@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net/sched: act_ife: preserve the action control in case of error | expand |
On Tue, Jun 19, 2018 at 6:45 AM, Davide Caratti <dcaratti@redhat.com> wrote: > 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>
From: Davide Caratti <dcaratti@redhat.com> Date: Tue, 19 Jun 2018 15:45:50 +0200 > 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> Applied and queued up for -stable.
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 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, } } + ife->tcf_action = parm->action; if (exists) spin_unlock_bh(&ife->tcf_lock);
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> --- net/sched/act_ife.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)