Commit cbf56c29 authored Jun 19, 2018 by Davide Caratti Committed by David S. Miller Jun 20, 2018

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: ef6980b6 ("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>

parent 0a889b94

net/sched/act_ife.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message