net/sched: flower: Ensure both minimum and maximum ports are specified
Subsystems (3)
PATCH 1/1 net/sched: flower: Ensure both minimum and maximum ports are specified
The kernel does not currently validate that both the minimum and maximum ports of a port range are specified. This can lead user space to think that a filter matching on a port range was successfully added, when in fact it was not. For example, with a patched (buggy) iproute2 that only sends the minimum port, the following commands do not return an error:
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp src_port 100-200 action pass
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp dst_port 100-200 action pass
# tc filter show dev swp1 ingress
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4
ip_proto udp
not_in_hw
action order 1: gact action pass
random type none pass val 0
index 1 ref 1 bind 1 filter protocol ip pref 1 flower chain 0 handle 0x2
eth_type ipv4
ip_proto udp
not_in_hw
action order 1: gact action pass
random type none pass val 0
index 2 ref 1 bind 1
Fix by returning an error unless both ports are specified:
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp src_port 100-200 action pass Error: Both min and max source ports must be specified. We have an error talking to the kernel
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp dst_port 100-200 action pass Error: Both min and max destination ports must be specified. We have an error talking to the kernel
--- net/sched/cls_flower.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/sched/cls_flower.c +10 -0
@@ -812,6 +812,16 @@ static int fl_set_key_port_range(struct nlattr **tb, struct fl_flow_key *key,TCA_FLOWER_KEY_PORT_SRC_MAX , &mask->tp_range.tp_max.src, TCA_FLOWER_UNSPEC, sizeof(key->tp_range.tp_max.src)); +if (mask->tp_range.tp_min.dst != mask->tp_range.tp_max.dst) { +NL_SET_ERR_MSG (extack, +"Both min and max destination ports must be specified" ); +return -EINVAL ; + } +if (mask->tp_range.tp_min.src != mask->tp_range.tp_max.src) { +NL_SET_ERR_MSG (extack, +"Both min and max source ports must be specified" ); +return -EINVAL ; + }if (mask->tp_range.tp_min.dst && mask->tp_range.tp_max.dst &&ntohs (key->tp_range.tp_max.dst) <=ntohs (key->tp_range.tp_min.dst)) {
Signature · 1 line
2.40.1
Quoted 35 lines · Ido Schimmel
The kernel does not currently validate that both the minimum and maximum ports of a port range are specified. This can lead user space to think that a filter matching on a port range was successfully added, when in fact it was not. For example, with a patched (buggy) iproute2 that only sends the minimum port, the following commands do not return an error:
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp src_port 100-200 action pass# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp dst_port 100-200 action pass# tc filter show dev swp1 ingress filter protocol ip pref 1 flower chain 0 filter protocol ip pref 1 flower chain 0 handle 0x1 eth_type ipv4 ip_proto udp not_in_hw action order 1: gact action pass random type none pass val 0 index 1 ref 1 bind 1filter protocol ip pref 1 flower chain 0 handle
0x2
eth_typeipv4
ip_protoudp
not_in_hw
action order 1: gact action pass
random type none pass val 0
index 2 ref 1 bind 1Fix by returning an error unless both ports are specified:
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp src_port 100-200 action pass Error: Both min and max source ports must be specified. We have an error talking to the kernel
Quoted 7 lines
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp dst_port 100-200 action pass Error: Both min and max destination ports must be specified. We have an error talking to the kernelFixes 5c72299fba9d ("net: sched: cls_flower: Classify packets using port ranges")Signed-off-by Ido Schimmel <[email protected]>Reviewed-by Petr Machata <[email protected]>
cheers,
jamal
Quoted 28 lines
--- net/sched/cls_flower.c | 10 ++++++++++ 1 file changed, 10 insertions(+)net/sched/cls_flower.c +10
-1@@ -812,6 +812,16 @@ static int fl_set_key_port_range(struct nlattr **tb, struct fl_flow_key *key,TCA_FLOWER_KEY_PORT_SRC_MAX , &mask->tp_range.tp_max.src, TCA_FLOWER_UNSPEC, sizeof(key->tp_range.tp_max.src)); +if (mask->tp_range.tp_min.dst != mask->tp_range.tp_max.dst) { +NL_SET_ERR_MSG (extack, +"Both min and max destination ports must be specified" ); +return -EINVAL ; + } +if (mask->tp_range.tp_min.src != mask->tp_range.tp_max.src) { +NL_SET_ERR_MSG (extack, +"Both min and max source ports must be specified" ); +return -EINVAL ; + }if (mask->tp_range.tp_min.dst && mask->tp_range.tp_max.dst &&ntohs (key->tp_range.tp_max.dst) <=ntohs (key->tp_range.tp_min.dst)) { --2.40.1
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Tue, 11 Jul 2023 10:08:09 +0300 you wrote:
The kernel does not currently validate that both the minimum and maximum ports of a port range are specified. This can lead user space to think that a filter matching on a port range was successfully added, when in fact it was not. For example, with a patched (buggy) iproute2 that only sends the minimum port, the following commands do not return an error:
# tc filter add dev swp1 ingress pref 1 proto ip flower ip_proto udp src_port 100-200 action pass[...]
Here is the summary with links:
- [net] net/sched: flower: Ensure both minimum and maximum ports are specified
https://git.kernel.org/netdev/net/c/d3f87278bcb8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html