redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: ef6980b6be ("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>
hifive-unleashed-5.1
Davide Caratti 2018-06-19 15:45:50 +02:00 committed by David S. Miller
parent 0a889b9404
commit cbf56c2962
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/sched/act_ife.c
View File

@ -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);