netdev - Re: [PATCH] net: bridge: Replace deprecated build flag HAVE_JUMP_LABEL with CONFIG_JUMP

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] [day] [month] [year] [list]

Message-ID: <20240305155327.GA137768@kernel.org>
Date: Tue, 5 Mar 2024 15:53:27 +0000
From: Simon Horman <horms@...nel.org>
To: Zixuan Tan <tanzixuan.me@...il.com>
Cc: Florian Westphal <fw@...len.de>, Roopa Prabhu <roopa@...dia.com>,
	Nikolay Aleksandrov <razor@...ckwall.org>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Pablo Neira Ayuso <pablo@...filter.org>, bridge@...ts.linux.dev,
	netdev@...r.kernel.org, linux-kernel <linux-kernel@...r.kernel.org>,
	Masahiro Yamada <masahiroy@...nel.org>
Subject: Re: [PATCH] net: bridge: Replace deprecated build flag
 HAVE_JUMP_LABEL with CONFIG_JUMP_LABEL

+ Masahiro Yamada <masahiroy@...nel.org>

On Tue, Mar 05, 2024 at 10:42:04PM +0800, Zixuan Tan wrote:
> The build flag HAVE_JUMP_LABEL has been deprecated and removed in commit
>  e9666d10a567 ("jump_label: move 'asm goto' support test to Kconfig").
> It is no longer defined or used. The correct flag to use is CONFIG_JUMP_LABEL.
> 
> Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in
> bridge input path")
> Signed-off-by: Zixuan Tan <tanzixuan.me@...il.com>

This patch seems to be mangled somehow and doesn't apply.
However, I believe that the change described by it is correct.

Reviewed-by: Simon Horman <horms@...nel.org>

> ---
>  net/bridge/br_input.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index f21097e73482..3700e47ff181 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
> @@ -255,7 +255,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb,
> struct sk_buff **pskb)
>     int ret;
> 
>     net = dev_net(skb->dev);
> -#ifdef HAVE_JUMP_LABEL
> +#ifdef CONFIG_JUMP_LABEL
>     if (!static_key_false(&nf_hooks_needed[NFPROTO_BRIDGE][NF_BR_PRE_ROUTING]))
>         goto frame_finish;
>  #endif
> -- 
> 2.40.1