summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIdo Schimmel <idosch@nvidia.com>2024-08-21 15:52:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-07 16:45:39 +0100
commit6631345c8fb27b426a8ac6cb5c7d41870084c2dc (patch)
tree36b95b0c4118cd22f0a51e02f51d8c2e318c01d7 /net
parent21b28f97e621cba196fb32c576734d216a8a79c9 (diff)
downloadlinux-6631345c8fb27b426a8ac6cb5c7d41870084c2dc.tar.gz
linux-6631345c8fb27b426a8ac6cb5c7d41870084c2dc.tar.bz2
linux-6631345c8fb27b426a8ac6cb5c7d41870084c2dc.zip
ipv4: icmp: Pass full DS field to ip_route_input()
[ Upstream commit 1c6f50b37f711b831d78973dad0df1da99ad0014 ] Align the ICMP code to other callers of ip_route_input() and pass the full DS field. In the future this will allow us to perform a route lookup 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-11-idosch@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of: 27843ce6ba3d ("ipvlan: ensure network headers are in skb linear part") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/icmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index b05fa424ad5c..3807a269e075 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -550,7 +550,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
orefdst = skb_in->_skb_refdst; /* save old refdst */
skb_dst_set(skb_in, NULL);
err = ip_route_input(skb_in, fl4_dec.daddr, fl4_dec.saddr,
- RT_TOS(tos), rt2->dst.dev);
+ tos, rt2->dst.dev);
dst_release(&rt2->dst);
rt2 = skb_rtable(skb_in);