netdev - Re: [PATCH net-next v7 10/11] tcp: make dropreason in tcp_child

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: <CANn89iKmaZZSnk5+CCtSH43jeUgRWNQPV4cjc0vpWNT7nHnQQg@mail.gmail.com>
Date: Wed, 21 Feb 2024 15:44:15 +0100
From: Eric Dumazet <edumazet@...gle.com>
To: Jason Xing <kerneljasonxing@...il.com>
Cc: davem@...emloft.net, kuba@...nel.org, pabeni@...hat.com, 
	dsahern@...nel.org, kuniyu@...zon.com, netdev@...r.kernel.org, 
	Jason Xing <kernelxing@...cent.com>
Subject: Re: [PATCH net-next v7 10/11] tcp: make dropreason in
 tcp_child_process() work

On Wed, Feb 21, 2024 at 3:58 AM Jason Xing <kerneljasonxing@...il.com> wrote:
>
> From: Jason Xing <kernelxing@...cent.com>
>
> It's time to let it work right now. We've already prepared for this:)
>
> Signed-off-by: Jason Xing <kernelxing@...cent.com>
> --
> v7
> Link: https://lore.kernel.org/all/20240219043815.98410-1-kuniyu@amazon.com/
> 1. adjust the related part of code only since patch [04/11] is changed.
> ---
>  net/ipv4/tcp_ipv4.c | 16 ++++++++++------
>  net/ipv6/tcp_ipv6.c | 20 +++++++++++++-------
>  2 files changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index c79e25549972..c886c671fae9 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1917,7 +1917,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
>                 if (!nsk)
>                         return 0;
>                 if (nsk != sk) {
> -                       if (tcp_child_process(sk, nsk, skb)) {
> +                       reason = tcp_child_process(sk, nsk, skb);
> +                       if (reason) {
>                                 rsk = nsk;
>                                 goto reset;
>                         }
> @@ -2276,12 +2277,15 @@ int tcp_v4_rcv(struct sk_buff *skb)
>                 if (nsk == sk) {
>                         reqsk_put(req);
>                         tcp_v4_restore_cb(skb);
> -               } else if (tcp_child_process(sk, nsk, skb)) {
> -                       tcp_v4_send_reset(nsk, skb);
> -                       goto discard_and_relse;
>                 } else {
> -                       sock_put(sk);
> -                       return 0;
> +                       drop_reason = tcp_child_process(sk, nsk, skb);
> +                       if (drop_reason) {
> +                               tcp_v4_send_reset(nsk, skb);
> +                               goto discard_and_relse;
> +                       } else {

No need for else after a goto (or a return)

> +                               sock_put(sk);
> +                               return 0;
> +                       }
>                 }
>         }
>
> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> index 4f8464e04b7f..f260c28e5b18 100644
> --- a/net/ipv6/tcp_ipv6.c
> +++ b/net/ipv6/tcp_ipv6.c
> @@ -1654,8 +1654,11 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
>                 struct sock *nsk = tcp_v6_cookie_check(sk, skb);
>
>                 if (nsk != sk) {
> -                       if (nsk && tcp_child_process(sk, nsk, skb))
> -                               goto reset;
> +                       if (nsk) {
> +                               reason = tcp_child_process(sk, nsk, skb);
> +                               if (reason)
> +                                       goto reset;
> +                       }
>                         if (opt_skb)
>                                 __kfree_skb(opt_skb);
>                         return 0;
> @@ -1854,12 +1857,15 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
>                 if (nsk == sk) {
>                         reqsk_put(req);
>                         tcp_v6_restore_cb(skb);
> -               } else if (tcp_child_process(sk, nsk, skb)) {
> -                       tcp_v6_send_reset(nsk, skb);
> -                       goto discard_and_relse;
>                 } else {
> -                       sock_put(sk);
> -                       return 0;
> +                       drop_reason = tcp_child_process(sk, nsk, skb);
> +                       if (drop_reason) {
> +                               tcp_v6_send_reset(nsk, skb);
> +                               goto discard_and_relse;
> +                       } else {


 Same here

> +                               sock_put(sk);
> +                               return 0;
> +                       }
>                 }
>         }
>
> --
> 2.37.3
>