ipv4: Convert icmp_route_lookup() to dscp_t.

Pass a dscp_t variable to icmp_route_lookup(), instead of a plain u8,
to prevent accidental setting of ECN bits in ->flowi4_tos. Rename that
variable ("tos" -> "dscp") to make the intent clear.

While there, reorganise the function parameters to fill up horizontal
space.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/294fead85c6035bcdc5fcf9a6bb4ce8798c45ba1.1727807926.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e1384e7331d82f3c60d5eb8758cc2c92edf50f91..7d7b25ed8d21b160253a17005e48ad726057c1de 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -478,13 +478,11 @@ static struct net_device *icmp_get_route_lookup_dev(struct sk_buff *skb)
        return route_lookup_dev;
 }
 
-static struct rtable *icmp_route_lookup(struct net *net,
-                                       struct flowi4 *fl4,
+static struct rtable *icmp_route_lookup(struct net *net, struct flowi4 *fl4,
                                        struct sk_buff *skb_in,
-                                       const struct iphdr *iph,
-                                       __be32 saddr, u8 tos, u32 mark,
-                                       int type, int code,
-                                       struct icmp_bxm *param)
+                                       const struct iphdr *iph, __be32 saddr,
+                                       dscp_t dscp, u32 mark, int type,
+                                       int code, struct icmp_bxm *param)
 {
        struct net_device *route_lookup_dev;
        struct dst_entry *dst, *dst2;
@@ -498,7 +496,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
        fl4->saddr = saddr;
        fl4->flowi4_mark = mark;
        fl4->flowi4_uid = sock_net_uid(net, NULL);
-       fl4->flowi4_tos = tos & INET_DSCP_MASK;
+       fl4->flowi4_tos = inet_dscp_to_dsfield(dscp);
        fl4->flowi4_proto = IPPROTO_ICMP;
        fl4->fl4_icmp_type = type;
        fl4->fl4_icmp_code = code;
@@ -547,7 +545,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,
-                                    tos, rt2->dst.dev);
+                                    inet_dscp_to_dsfield(dscp), rt2->dst.dev);
 
                dst_release(&rt2->dst);
                rt2 = skb_rtable(skb_in);
@@ -741,8 +739,9 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
        ipc.opt = &icmp_param.replyopts.opt;
        ipc.sockc.mark = mark;
 
-       rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr, tos, mark,
-                              type, code, &icmp_param);
+       rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr,
+                              inet_dsfield_to_dscp(tos), mark, type, code,
+                              &icmp_param);
        if (IS_ERR(rt))
                goto out_unlock;