]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
netfilter: nf_tables: Only use nf_skip_indirect_calls() when MITIGATION_RETPOLINE
authorWangYuli <wangyuli@uniontech.com>
Wed, 19 Mar 2025 14:01:47 +0000 (22:01 +0800)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sun, 23 Mar 2025 09:53:47 +0000 (10:53 +0100)
commite3a4182edd1ae60e7e3539ff3b3784af9830d223
tree82f353d931c6c53be7a602442feb85fe841ed8f4
parent932b32ffd7604fb00b5c57e239a3cc4d901ccf6e
netfilter: nf_tables: Only use nf_skip_indirect_calls() when MITIGATION_RETPOLINE

1. MITIGATION_RETPOLINE is x86-only (defined in arch/x86/Kconfig),
so no need to AND with CONFIG_X86 when checking if enabled.

2. Remove unused declaration of nf_skip_indirect_calls() when
MITIGATION_RETPOLINE is disabled to avoid warnings.

3. Declare nf_skip_indirect_calls() and nf_skip_indirect_calls_enable()
as inline when MITIGATION_RETPOLINE is enabled, as they are called
only once and have simple logic.

Fix follow error with clang-21 when W=1e:
  net/netfilter/nf_tables_core.c:39:20: error: unused function 'nf_skip_indirect_calls' [-Werror,-Wunused-function]
     39 | static inline bool nf_skip_indirect_calls(void) { return false; }
        |                    ^~~~~~~~~~~~~~~~~~~~~~
  1 error generated.
  make[4]: *** [scripts/Makefile.build:207: net/netfilter/nf_tables_core.o] Error 1
  make[3]: *** [scripts/Makefile.build:465: net/netfilter] Error 2
  make[3]: *** Waiting for unfinished jobs....

Fixes: d8d760627855 ("netfilter: nf_tables: add static key to skip retpoline workarounds")
Co-developed-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_tables_core.c