From: Ido Schimmel <idosch@nvidia.com>
Date: Wed, 21 Aug 2024 12:52:47 +0000 (+0300)
Subject: ipv4: Unmask upper DSCP bits in input route lookup
X-Git-Tag: v6.12-rc1~232^2~198^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df9131c7fafdc0d4c85686f5c7711a4dd4f3ae60;p=thirdparty%2Fkernel%2Flinux.git

ipv4: Unmask upper DSCP bits in input route lookup

Unmask the upper DSCP bits in input route lookup so that in the future
the lookup could be performed according to the full DSCP value.

No functional changes intended since the upper DSCP bits are masked when
comparing against the TOS selectors in FIB rules and routes.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Acked-by: Florian Westphal <fw@strlen.de>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20240821125251.1571445-9-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 9b6528b7b5629..73bb61162445f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2470,7 +2470,7 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
 	struct fib_result res;
 	int err;
 
-	tos &= IPTOS_RT_MASK;
+	tos &= INET_DSCP_MASK;
 	rcu_read_lock();
 	err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);
 	rcu_read_unlock();