mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-27 22:51:31 +00:00
9c5eee0afc
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: 45a497f2d1 (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>
81 lines
1.7 KiB
C
81 lines
1.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
|
|
*/
|
|
|
|
#ifndef __NET_TC_VLAN_H
|
|
#define __NET_TC_VLAN_H
|
|
|
|
#include <net/act_api.h>
|
|
#include <linux/tc_act/tc_vlan.h>
|
|
|
|
struct tcf_vlan_params {
|
|
int tcfv_action;
|
|
unsigned char tcfv_push_dst[ETH_ALEN];
|
|
unsigned char tcfv_push_src[ETH_ALEN];
|
|
u16 tcfv_push_vid;
|
|
__be16 tcfv_push_proto;
|
|
u8 tcfv_push_prio;
|
|
bool tcfv_push_prio_exists;
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
struct tcf_vlan {
|
|
struct tc_action common;
|
|
struct tcf_vlan_params __rcu *vlan_p;
|
|
};
|
|
#define to_vlan(a) ((struct tcf_vlan *)a)
|
|
|
|
static inline bool is_tcf_vlan(const struct tc_action *a)
|
|
{
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
if (a->ops && a->ops->id == TCA_ID_VLAN)
|
|
return true;
|
|
#endif
|
|
return false;
|
|
}
|
|
|
|
static inline u32 tcf_vlan_action(const struct tc_action *a)
|
|
{
|
|
u32 tcfv_action;
|
|
|
|
rcu_read_lock();
|
|
tcfv_action = rcu_dereference(to_vlan(a)->vlan_p)->tcfv_action;
|
|
rcu_read_unlock();
|
|
|
|
return tcfv_action;
|
|
}
|
|
|
|
static inline u16 tcf_vlan_push_vid(const struct tc_action *a)
|
|
{
|
|
u16 tcfv_push_vid;
|
|
|
|
rcu_read_lock();
|
|
tcfv_push_vid = rcu_dereference(to_vlan(a)->vlan_p)->tcfv_push_vid;
|
|
rcu_read_unlock();
|
|
|
|
return tcfv_push_vid;
|
|
}
|
|
|
|
static inline __be16 tcf_vlan_push_proto(const struct tc_action *a)
|
|
{
|
|
__be16 tcfv_push_proto;
|
|
|
|
rcu_read_lock();
|
|
tcfv_push_proto = rcu_dereference(to_vlan(a)->vlan_p)->tcfv_push_proto;
|
|
rcu_read_unlock();
|
|
|
|
return tcfv_push_proto;
|
|
}
|
|
|
|
static inline u8 tcf_vlan_push_prio(const struct tc_action *a)
|
|
{
|
|
u8 tcfv_push_prio;
|
|
|
|
rcu_read_lock();
|
|
tcfv_push_prio = rcu_dereference(to_vlan(a)->vlan_p)->tcfv_push_prio;
|
|
rcu_read_unlock();
|
|
|
|
return tcfv_push_prio;
|
|
}
|
|
#endif /* __NET_TC_VLAN_H */
|