netdev - Re: [PATCH net] skbuff: Fix build with SKB extensions disabled

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]

Date:   Thu, 8 Jul 2021 09:24:15 +0300
From:   Roi Dayan <roid@...dia.com>
To:     Florian Fainelli <f.fainelli@...il.com>, <netdev@...r.kernel.org>
CC:     Paul Blakey <paulb@...dia.com>,
        Eric Dumazet <eric.dumazet@...il.com>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        mika penttila <mika.penttila@...tfour.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        John Fastabend <john.fastabend@...il.com>,
        Saeed Mahameed <saeedm@...dia.com>,
        Oz Shlomo <ozsh@...dia.com>, Vlad Buslov <vladbu@...dia.com>
Subject: Re: [PATCH net] skbuff: Fix build with SKB extensions disabled



On 2021-07-08 7:10 AM, Florian Fainelli wrote:
> We will fail to build with CONFIG_SKB_EXTENSIONS disabled after
> 8550ff8d8c75 ("skbuff: Release nfct refcount on napi stolen or re-used
> skbs") since there is an unconditionally use of skb_ext_find() without
> an appropriate stub. Simply build the code conditionally and properly
> guard against both COFNIG_SKB_EXTENSIONS as well as
> CONFIG_NET_TC_SKB_EXT being disabled.
> 
> Fixes: Fixes: 8550ff8d8c75 ("skbuff: Release nfct refcount on napi stolen or re-used skbs")
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
> ---
>   net/core/dev.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 177a5aec0b6b..03c95a0867bb 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -6010,7 +6010,7 @@ static void gro_list_prepare(const struct list_head *head,
>   				       maclen);
>   
>   		diffs |= skb_get_nfct(p) ^ skb_get_nfct(skb);
> -
> +#if IS_ENABLED(CONFIG_SKB_EXTENSIONS) && IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
>   		if (!diffs) {
>   			struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
>   			struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
> @@ -6019,6 +6019,7 @@ static void gro_list_prepare(const struct list_head *head,
>   			if (!diffs && unlikely(skb_ext))
>   				diffs |= p_ext->chain ^ skb_ext->chain;
>   		}
> +#endif
>   
>   		NAPI_GRO_CB(p)->same_flow = !diffs;
>   	}
> 

thanks. sorry for missing this.
tested compilation before and after the patch with combination
of the mentioned options to be sure.

Reviewed-by: Roi Dayan <roid@...dia.com>