* [PATCH nft v2] json: don't BUG when asked to list synproxies
@ 2025-03-27 16:32 Florian Westphal
2025-03-27 20:31 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2025-03-27 16:32 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
"-j list synproxys" triggers a BUG().
Rewrite this so that all enum values are handled so the compiler can alert
us to a missing value in case there are more commands in the future.
While at it, implement a few low-hanging fruites as well.
Not-yet-supported cases are simply ignored.
v2: return EOPNOTSUPP for unsupported commands (Pablo Neira Ayuso)
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/evaluate.c | 6 ++++--
src/json.c | 26 ++++++++++++++++++++++++--
src/rule.c | 12 ++++++++++--
3 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/evaluate.c b/src/evaluate.c
index bd99e33971f7..a6b08cf3b1b5 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -6329,7 +6329,9 @@ int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd)
return cmd_evaluate_monitor(ctx, cmd);
case CMD_IMPORT:
return cmd_evaluate_import(ctx, cmd);
- default:
- BUG("invalid command operation %u\n", cmd->op);
+ case CMD_INVALID:
+ break;
};
+
+ BUG("invalid command operation %u\n", cmd->op);
}
diff --git a/src/json.c b/src/json.c
index 831bc90f0833..adebe47980b9 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1971,7 +1971,7 @@ static json_t *generate_json_metainfo(void)
int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
{
struct table *table = NULL;
- json_t *root;
+ json_t *root = NULL;
if (cmd->handle.table.name) {
table = table_cache_find(&ctx->nft->cache.table_cache,
@@ -2031,6 +2031,13 @@ int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
case CMD_OBJ_CT_HELPERS:
root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_HELPER);
break;
+ case CMD_OBJ_CT_TIMEOUT:
+ case CMD_OBJ_CT_TIMEOUTS:
+ root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_TIMEOUT);
+ case CMD_OBJ_CT_EXPECT:
+ case CMD_OBJ_CT_EXPECTATIONS:
+ root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_EXPECT);
+ break;
case CMD_OBJ_LIMIT:
case CMD_OBJ_LIMITS:
root = do_list_obj_json(ctx, cmd, NFT_OBJECT_LIMIT);
@@ -2039,14 +2046,29 @@ int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
case CMD_OBJ_SECMARKS:
root = do_list_obj_json(ctx, cmd, NFT_OBJECT_SECMARK);
break;
+ case CMD_OBJ_SYNPROXY:
+ case CMD_OBJ_SYNPROXYS:
+ root = do_list_obj_json(ctx, cmd, NFT_OBJECT_SYNPROXY);
+ break;
case CMD_OBJ_FLOWTABLE:
root = do_list_flowtable_json(ctx, cmd, table);
break;
case CMD_OBJ_FLOWTABLES:
root = do_list_flowtables_json(ctx, cmd);
break;
- default:
+ case CMD_OBJ_HOOKS:
+ return 0;
+ case CMD_OBJ_MONITOR:
+ case CMD_OBJ_MARKUP:
+ case CMD_OBJ_SETELEMS:
+ case CMD_OBJ_RULE:
+ case CMD_OBJ_EXPR:
+ case CMD_OBJ_ELEMENTS:
+ errno = EOPNOTSUPP;
+ return -1;
+ case CMD_OBJ_INVALID:
BUG("invalid command object type %u\n", cmd->obj);
+ break;
}
if (!json_is_array(root)) {
diff --git a/src/rule.c b/src/rule.c
index 00fbbc4c080a..80315837baf0 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -2445,10 +2445,18 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
return do_list_flowtables(ctx, cmd);
case CMD_OBJ_HOOKS:
return do_list_hooks(ctx, cmd);
- default:
- BUG("invalid command object type %u\n", cmd->obj);
+ case CMD_OBJ_MONITOR:
+ case CMD_OBJ_MARKUP:
+ case CMD_OBJ_SETELEMS:
+ case CMD_OBJ_EXPR:
+ case CMD_OBJ_ELEMENTS:
+ errno = EOPNOTSUPP;
+ return -1;
+ case CMD_OBJ_INVALID:
+ break;
}
+ BUG("invalid command object type %u\n", cmd->obj);
return 0;
}
--
2.48.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nft v2] json: don't BUG when asked to list synproxies
2025-03-27 16:32 [PATCH nft v2] json: don't BUG when asked to list synproxies Florian Westphal
@ 2025-03-27 20:31 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2025-03-27 20:31 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Thu, Mar 27, 2025 at 05:32:00PM +0100, Florian Westphal wrote:
> "-j list synproxys" triggers a BUG().
>
> Rewrite this so that all enum values are handled so the compiler can alert
> us to a missing value in case there are more commands in the future.
>
> While at it, implement a few low-hanging fruites as well.
>
> Not-yet-supported cases are simply ignored.
>
> v2: return EOPNOTSUPP for unsupported commands (Pablo Neira Ayuso)
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
Thanks
> ---
> src/evaluate.c | 6 ++++--
> src/json.c | 26 ++++++++++++++++++++++++--
> src/rule.c | 12 ++++++++++--
> 3 files changed, 38 insertions(+), 6 deletions(-)
>
> diff --git a/src/evaluate.c b/src/evaluate.c
> index bd99e33971f7..a6b08cf3b1b5 100644
> --- a/src/evaluate.c
> +++ b/src/evaluate.c
> @@ -6329,7 +6329,9 @@ int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd)
> return cmd_evaluate_monitor(ctx, cmd);
> case CMD_IMPORT:
> return cmd_evaluate_import(ctx, cmd);
> - default:
> - BUG("invalid command operation %u\n", cmd->op);
> + case CMD_INVALID:
> + break;
> };
> +
> + BUG("invalid command operation %u\n", cmd->op);
> }
> diff --git a/src/json.c b/src/json.c
> index 831bc90f0833..adebe47980b9 100644
> --- a/src/json.c
> +++ b/src/json.c
> @@ -1971,7 +1971,7 @@ static json_t *generate_json_metainfo(void)
> int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
> {
> struct table *table = NULL;
> - json_t *root;
> + json_t *root = NULL;
>
> if (cmd->handle.table.name) {
> table = table_cache_find(&ctx->nft->cache.table_cache,
> @@ -2031,6 +2031,13 @@ int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
> case CMD_OBJ_CT_HELPERS:
> root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_HELPER);
> break;
> + case CMD_OBJ_CT_TIMEOUT:
> + case CMD_OBJ_CT_TIMEOUTS:
> + root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_TIMEOUT);
> + case CMD_OBJ_CT_EXPECT:
> + case CMD_OBJ_CT_EXPECTATIONS:
> + root = do_list_obj_json(ctx, cmd, NFT_OBJECT_CT_EXPECT);
> + break;
> case CMD_OBJ_LIMIT:
> case CMD_OBJ_LIMITS:
> root = do_list_obj_json(ctx, cmd, NFT_OBJECT_LIMIT);
> @@ -2039,14 +2046,29 @@ int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
> case CMD_OBJ_SECMARKS:
> root = do_list_obj_json(ctx, cmd, NFT_OBJECT_SECMARK);
> break;
> + case CMD_OBJ_SYNPROXY:
> + case CMD_OBJ_SYNPROXYS:
> + root = do_list_obj_json(ctx, cmd, NFT_OBJECT_SYNPROXY);
> + break;
> case CMD_OBJ_FLOWTABLE:
> root = do_list_flowtable_json(ctx, cmd, table);
> break;
> case CMD_OBJ_FLOWTABLES:
> root = do_list_flowtables_json(ctx, cmd);
> break;
> - default:
> + case CMD_OBJ_HOOKS:
> + return 0;
> + case CMD_OBJ_MONITOR:
> + case CMD_OBJ_MARKUP:
> + case CMD_OBJ_SETELEMS:
> + case CMD_OBJ_RULE:
> + case CMD_OBJ_EXPR:
> + case CMD_OBJ_ELEMENTS:
> + errno = EOPNOTSUPP;
> + return -1;
> + case CMD_OBJ_INVALID:
> BUG("invalid command object type %u\n", cmd->obj);
> + break;
> }
>
> if (!json_is_array(root)) {
> diff --git a/src/rule.c b/src/rule.c
> index 00fbbc4c080a..80315837baf0 100644
> --- a/src/rule.c
> +++ b/src/rule.c
> @@ -2445,10 +2445,18 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
> return do_list_flowtables(ctx, cmd);
> case CMD_OBJ_HOOKS:
> return do_list_hooks(ctx, cmd);
> - default:
> - BUG("invalid command object type %u\n", cmd->obj);
> + case CMD_OBJ_MONITOR:
> + case CMD_OBJ_MARKUP:
> + case CMD_OBJ_SETELEMS:
> + case CMD_OBJ_EXPR:
> + case CMD_OBJ_ELEMENTS:
> + errno = EOPNOTSUPP;
> + return -1;
> + case CMD_OBJ_INVALID:
> + break;
> }
>
> + BUG("invalid command object type %u\n", cmd->obj);
> return 0;
> }
>
> --
> 2.48.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-27 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-27 16:32 [PATCH nft v2] json: don't BUG when asked to list synproxies Florian Westphal
2025-03-27 20:31 ` 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).