ipv4: Convert fib_validate_source() to dscp_t.

Pass a dscp_t variable to fib_validate_source(), instead of a plain u8,
to prevent accidental setting of ECN bits in ->flowi4_tos.

All callers of fib_validate_source() already have a dscp_t variable to
pass as parameter. We just need to remove the inet_dscp_to_dsfield()
conversions.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/08612a4519bc5a3578bb493fbaad82437ebb73dc.1728302212.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 967e4dc555face31a736f6108cea6b929478beba..06130933542dbe3fb6e1399c70e75b354ed7945b 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -449,8 +449,9 @@ int fib_gw_from_via(struct fib_config *cfg, struct nlattr *nla,
 __be32 fib_compute_spec_dst(struct sk_buff *skb);
 bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev);
 int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
-                       u8 tos, int oif, struct net_device *dev,
+                       dscp_t dscp, int oif, struct net_device *dev,
                        struct in_device *idev, u32 *itag);
+
 #ifdef CONFIG_IP_ROUTE_CLASSID
 static inline int fib_num_tclassid_users(struct net *net)
 {

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 793e6781399a4fa575a51e5508d0cac0663e36e1..d0fbc8c8c5e6a59e5e56887e20f09ce9b5670244 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -419,7 +419,7 @@ e_rpf:
 
 /* Ignore rp_filter for packets protected by IPsec. */
 int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
-                       u8 tos, int oif, struct net_device *dev,
+                       dscp_t dscp, int oif, struct net_device *dev,
                        struct in_device *idev, u32 *itag)
 {
        int r = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(idev);
@@ -448,7 +448,8 @@ ok:
        }
 
 full_check:
-       return __fib_validate_source(skb, src, dst, tos, oif, dev, r, idev, itag);
+       return __fib_validate_source(skb, src, dst, inet_dscp_to_dsfield(dscp),
+                                    oif, dev, r, idev, itag);
 }
 
 static inline __be32 sk_extract_addr(struct sockaddr *addr)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1efb65e647c14354c49bffb92aa0b8ab39d761a4..a0b091a7df87430d9e21d31edc99e6c32760a1b7 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1687,9 +1687,8 @@ int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
                    ip_hdr(skb)->protocol != IPPROTO_IGMP)
                        return -EINVAL;
        } else {
-               err = fib_validate_source(skb, saddr, 0,
-                                         inet_dscp_to_dsfield(dscp), 0, dev,
-                                         in_dev, itag);
+               err = fib_validate_source(skb, saddr, 0, dscp, 0, dev, in_dev,
+                                         itag);
                if (err < 0)
                        return err;
        }
@@ -1786,8 +1785,8 @@ static int __mkroute_input(struct sk_buff *skb, const struct fib_result *res,
                return -EINVAL;
        }
 
-       err = fib_validate_source(skb, saddr, daddr, inet_dscp_to_dsfield(dscp),
-                                 FIB_RES_OIF(*res), in_dev->dev, in_dev, &itag);
+       err = fib_validate_source(skb, saddr, daddr, dscp, FIB_RES_OIF(*res),
+                                 in_dev->dev, in_dev, &itag);
        if (err < 0) {
                ip_handle_martian_source(in_dev->dev, in_dev, skb, daddr,
                                         saddr);
@@ -2159,8 +2158,8 @@ int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr,
        if (rt->rt_type != RTN_LOCAL)
                goto skip_validate_source;
 
-       err = fib_validate_source(skb, saddr, daddr, inet_dscp_to_dsfield(dscp),
-                                 0, dev, in_dev, &tag);
+       err = fib_validate_source(skb, saddr, daddr, dscp, 0, dev, in_dev,
+                                 &tag);
        if (err < 0)
                goto martian_source;
 
@@ -2298,8 +2297,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
        }
 
        if (res->type == RTN_LOCAL) {
-               err = fib_validate_source(skb, saddr, daddr,
-                                         inet_dscp_to_dsfield(dscp), 0, dev,
+               err = fib_validate_source(skb, saddr, daddr, dscp, 0, dev,
                                          in_dev, &itag);
                if (err < 0)
                        goto martian_source;
@@ -2322,9 +2320,8 @@ brd_input:
                goto e_inval;
 
        if (!ipv4_is_zeronet(saddr)) {
-               err = fib_validate_source(skb, saddr, 0,
-                                         inet_dscp_to_dsfield(dscp), 0, dev,
-                                         in_dev, &itag);
+               err = fib_validate_source(skb, saddr, 0, dscp, 0, dev, in_dev,
+                                         &itag);
                if (err < 0)
                        goto martian_source;
        }