netdev - Re: [PATCH net-next] dccp: Prepare dccp_v4_route_skb() to .flowi4

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANn89iJQus-pqLta39df06DJLES8KgytN5iaVz9xv_HAz3F6Vw@mail.gmail.com>
Date: Tue, 14 Jan 2025 18:43:15 +0100
From: Eric Dumazet <edumazet@...gle.com>
To: Guillaume Nault <gnault@...hat.com>
Cc: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, 
	Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org, Simon Horman <horms@...nel.org>, 
	dccp@...r.kernel.org, Ido Schimmel <idosch@...dia.com>
Subject: Re: [PATCH net-next] dccp: Prepare dccp_v4_route_skb() to .flowi4_tos conversion.

On Tue, Jan 14, 2025 at 4:46 PM Guillaume Nault <gnault@...hat.com> wrote:
>
> Use inet_sk_dscp() to get the socket DSCP value as dscp_t, instead of
> ip_sock_rt_tos() which returns a __u8. This will ease the conversion
> of fl4->flowi4_tos to dscp_t, as it will just require to drop the
> inet_dscp_to_dsfield() call.
>
> Signed-off-by: Guillaume Nault <gnault@...hat.com>
> ---
>  net/dccp/ipv4.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
> index 5926159a6f20..9e64dbd38cd7 100644
> --- a/net/dccp/ipv4.c
> +++ b/net/dccp/ipv4.c
> @@ -15,6 +15,7 @@
>
>  #include <net/icmp.h>
>  #include <net/inet_common.h>
> +#include <net/inet_dscp.h>
>  #include <net/inet_hashtables.h>
>  #include <net/inet_sock.h>
>  #include <net/protocol.h>
> @@ -473,7 +474,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
>                 .flowi4_oif = inet_iif(skb),
>                 .daddr = iph->saddr,
>                 .saddr = iph->daddr,
> -               .flowi4_tos = ip_sock_rt_tos(sk),
> +               .flowi4_tos = inet_dscp_to_dsfield(inet_sk_dscp((inet_sk(sk)))),

You probably can replace ((X)) with (X) ?
->
 .flowi4_tos = inet_dscp_to_dsfield(inet_sk_dscp(inet_sk(sk))),


>                 .flowi4_scope = ip_sock_rt_scope(sk),
>                 .flowi4_proto = sk->sk_protocol,
>                 .fl4_sport = dccp_hdr(skb)->dccph_dport,
> --
> 2.39.2
>