netdev - Re: [RFC PATCH 04/12] net: Make generic dst->child usage more explicit.

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: <1508943317.30291.123.camel@edumazet-glaptop3.roam.corp.google.com>
Date:   Wed, 25 Oct 2017 07:55:17 -0700
From:   Eric Dumazet <eric.dumazet@...il.com>
To:     David Miller <davem@...emloft.net>
Cc:     netdev@...r.kernel.org
Subject: Re: [RFC PATCH 04/12] net: Make generic dst->child usage more
 explicit.

On Wed, 2017-10-25 at 23:03 +0900, David Miller wrote:
> Only IPSEC (xfrm) routes have a dst->child which is non-NULL.
> xfrm routes are identified by dst->xfrm being non-NULL.
> 
> Codify this explicitly in dst_destroy().
> 
> Signed-off-by: David S. Miller <davem@...emloft.net>
> ---
>  net/core/dst.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/net/core/dst.c b/net/core/dst.c
> index 662a2d4a3d19..6a3c21b8fc8d 100644
> --- a/net/core/dst.c
> +++ b/net/core/dst.c
> @@ -116,12 +116,14 @@ EXPORT_SYMBOL(dst_alloc);
>  
>  struct dst_entry *dst_destroy(struct dst_entry * dst)
>  {
> -	struct dst_entry *child;
> +	struct dst_entry *child = NULL;
>  
>  	smp_rmb();
>  
> -	child = dst->child;
> -
> +#ifdef CONFIG_XFRM
> +	if (dst->xfrm)
> +		child = dst->child;
> +#endif
>  	if (!(dst->flags & DST_NOCOUNT))
>  		dst_entries_add(dst->ops, -1);
>  

You might squash this patch with the following one ;)