* [PATCH nf] netfilter: nft_ct: bail out if helper is not found for NFPROTO_{IPV4,IPV6}
@ 2024-01-29 19:05 Pablo Neira Ayuso
2024-01-29 22:12 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2024-01-29 19:05 UTC (permalink / raw)
To: netfilter-devel; +Cc: fw
Otherwise, this assigns the NULL helper. Bail out from control plane path
if the kernel does not provide this helper.
Fixes: 1a64edf54f55 ("netfilter: nft_ct: add helper set support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_ct.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 715a154f243c..6f7e49752bfa 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -1077,6 +1077,8 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,
help4 = nf_conntrack_helper_try_module_get(name, family,
priv->l4proto);
+ if (!help4)
+ return -ENOENT;
break;
case NFPROTO_IPV6:
if (ctx->family == NFPROTO_IPV4)
@@ -1084,6 +1086,8 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,
help6 = nf_conntrack_helper_try_module_get(name, family,
priv->l4proto);
+ if (!help6)
+ return -ENOENT;
break;
case NFPROTO_NETDEV:
case NFPROTO_BRIDGE:
@@ -1092,15 +1096,14 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,
priv->l4proto);
help6 = nf_conntrack_helper_try_module_get(name, NFPROTO_IPV6,
priv->l4proto);
+ /* && is intentional; only error if INET found neither ipv4 or ipv6 */
+ if (!help4 && !help6)
+ return -ENOENT;
break;
default:
return -EAFNOSUPPORT;
}
- /* && is intentional; only error if INET found neither ipv4 or ipv6 */
- if (!help4 && !help6)
- return -ENOENT;
-
priv->helper4 = help4;
priv->helper6 = help6;
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf] netfilter: nft_ct: bail out if helper is not found for NFPROTO_{IPV4,IPV6}
2024-01-29 19:05 [PATCH nf] netfilter: nft_ct: bail out if helper is not found for NFPROTO_{IPV4,IPV6} Pablo Neira Ayuso
@ 2024-01-29 22:12 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2024-01-29 22:12 UTC (permalink / raw)
To: netfilter-devel; +Cc: fw
On Mon, Jan 29, 2024 at 08:05:38PM +0100, Pablo Neira Ayuso wrote:
> Otherwise, this assigns the NULL helper. Bail out from control plane path
> if the kernel does not provide this helper.
Scratch this, help4 and help6 are set to NULL, the existing
!help4 && !help6 is sufficient.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-29 22:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-29 19:05 [PATCH nf] netfilter: nft_ct: bail out if helper is not found for NFPROTO_{IPV4,IPV6} Pablo Neira Ayuso
2024-01-29 22:12 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).