mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 16:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: fib_rules: Add port mask matching

Browse Source 
Extend IPv4 FIB rules to match on source and destination ports using a
mask. Note that the mask is only set when not matching on a range.

Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250217134109.311176-4-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ido Schimmel 2025-02-17 15:41:04 +02:00 committed by Jakub Kicinski
parent da7665947b
commit 79a4e21584
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/net/fib_rules.h
View File

@ -148,6 +148,17 @@ static inline bool fib_rule_port_inrange(const struct fib_rule_port_range *a,
ntohs(port) <= a->end;
}
static inline bool fib_rule_port_match(const struct fib_rule_port_range *range,
u16 port_mask, __be16 port)
{
if ((range->start ^ ntohs(port)) & port_mask)
return false;
if (!port_mask && fib_rule_port_range_set(range) &&
!fib_rule_port_inrange(range, port))
return false;
return true;
}
static inline bool fib_rule_port_range_valid(const struct fib_rule_port_range *a)
{
return a->start != 0 && a->end != 0 && a->end < 0xffff &&

8
net/ipv4/fib_rules.c
View File

@ -201,12 +201,12 @@ INDIRECT_CALLABLE_SCOPE int fib4_rule_match(struct fib_rule *rule,
if (rule->ip_proto && (rule->ip_proto != fl4->flowi4_proto))
return 0;
if (fib_rule_port_range_set(&rule->sport_range) &&
!fib_rule_port_inrange(&rule->sport_range, fl4->fl4_sport))
if (!fib_rule_port_match(&rule->sport_range, rule->sport_mask,
fl4->fl4_sport))
return 0;
if (fib_rule_port_range_set(&rule->dport_range) &&
!fib_rule_port_inrange(&rule->dport_range, fl4->fl4_dport))
if (!fib_rule_port_match(&rule->dport_range, rule->dport_mask,
fl4->fl4_dport))
return 0;
return 1;