Commit 783946aa authored by Guillaume Nault's avatar Guillaume Nault Committed by Jakub Kicinski
Browse files

ipv4: Convert ip_route_input_slow() to dscp_t. 



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

Only ip_route_input_rcu() actually calls ip_route_input_slow(). Since
it already has a dscp_t variable to pass as parameter, we only need to
remove the inet_dscp_to_dsfield() conversion.

Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/d6bca5f87eea9e83a3861e6e05594cdd252583c9.1727807926.git.gnault@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent be612f5e

net/ipv4/route.c

+10 −8
Original line number Diff line number Diff line
@@ -2201,7 +2201,7 @@ static struct net_device *ip_rt_get_dev(struct net *net, 
 */



static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			       u8 tos, struct net_device *dev,

			       dscp_t dscp, struct net_device *dev,

			       struct fib_result *res)

{

	struct in_device *in_dev = __in_dev_get_rcu(dev);
@@ -2266,7 +2266,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	fl4.flowi4_oif = 0;

	fl4.flowi4_iif = dev->ifindex;

	fl4.flowi4_mark = skb->mark;

	fl4.flowi4_tos = tos;

	fl4.flowi4_tos = inet_dscp_to_dsfield(dscp);

	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;

	fl4.flowi4_flags = 0;

	fl4.daddr = daddr;
@@ -2299,8 +2299,9 @@ 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, tos,

					  0, dev, in_dev, &itag);

		err = fib_validate_source(skb, saddr, daddr,

					  inet_dscp_to_dsfield(dscp), 0, dev,

					  in_dev, &itag);

		if (err < 0)

			goto martian_source;

		goto local_input;
@@ -2314,7 +2315,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
		goto martian_destination;



make_route:

	err = ip_mkroute_input(skb, res, in_dev, daddr, saddr, tos, flkeys);

	err = ip_mkroute_input(skb, res, in_dev, daddr, saddr,

			       inet_dscp_to_dsfield(dscp), flkeys);

out:	return err;



brd_input:
@@ -2322,7 +2324,8 @@ out: return err; 
		goto e_inval;



	if (!ipv4_is_zeronet(saddr)) {

		err = fib_validate_source(skb, saddr, 0, tos, 0, dev,

		err = fib_validate_source(skb, saddr, 0,

					  inet_dscp_to_dsfield(dscp), 0, dev,

					  in_dev, &itag);

		if (err < 0)

			goto martian_source;
@@ -2463,8 +2466,7 @@ static int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
		return err;

	}



	return ip_route_input_slow(skb, daddr, saddr,

				   inet_dscp_to_dsfield(dscp), dev, res);

	return ip_route_input_slow(skb, daddr, saddr, dscp, dev, res);

}



int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,