]> git.baikalelectronics.ru Git - kernel.git/commit
net/sched: act_vlan: Fix modify to allow 0
authorBoris Sukholitko <boris.sukholitko@broadcom.com>
Tue, 1 Jun 2021 12:30:50 +0000 (15:30 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:53:27 +0000 (16:53 +0200)
commitc29ee04a7033ffd8ebadf54ca0282bd64a13f1e6
tree085344c9268c4e3eeaba52f8d215bf6df3febf3f
parent37baad0f03a7bf3e9827493b71f19533854b5418
net/sched: act_vlan: Fix modify to allow 0

[ Upstream commit 9c5eee0afca09cbde6bd00f77876754aaa552970 ]

Currently vlan modification action checks existence of vlan priority by
comparing it to 0. Therefore it is impossible to modify existing vlan
tag to have priority 0.

For example, the following tc command will change the vlan id but will
not affect vlan priority:

tc filter add dev eth1 ingress matchall action vlan modify id 300 \
        priority 0 pipe mirred egress redirect dev eth2

The incoming packet on eth1:

ethertype 802.1Q (0x8100), vlan 200, p 4, ethertype IPv4

will be changed to:

ethertype 802.1Q (0x8100), vlan 300, p 4, ethertype IPv4

although the user has intended to have p == 0.

The fix is to add tcfv_push_prio_exists flag to struct tcf_vlan_params
and rely on it when deciding to set the priority.

Fixes: 015d3edcb38a1d5188e6 (net/sched: act_vlan: Introduce TCA_VLAN_ACT_MODIFY vlan action)
Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/net/tc_act/tc_vlan.h
net/sched/act_vlan.c