| From 4c86977dc78555c0ff9bf83763092edf6b398ba3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 27 Jan 2026 11:19:23 +0100 |
| Subject: net: bridge: fix static key check |
| |
| From: Martin Kaiser <martin@kaiser.cx> |
| |
| [ Upstream commit cc0cf10fdaeadf5542d64a55b5b4120d3df90b7d ] |
| |
| Fix the check if netfilter's static keys are available. netfilter defines |
| and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL |
| is never defined.) |
| |
| Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path") |
| Signed-off-by: Martin Kaiser <martin@kaiser.cx> |
| Reviewed-by: Florian Westphal <fw@strlen.de> |
| Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> |
| Link: https://patch.msgid.link/20260127101925.1754425-1-martin@kaiser.cx |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.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 f11345720c275..e33500771b30f 100644 |
| --- a/net/bridge/br_input.c |
| +++ b/net/bridge/br_input.c |
| @@ -243,7 +243,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.51.0 |
| |
