src: move BASECHAIN flag toggle to netlink linearize code for device update
Florian Westphal
maintainerPATCH 1/1 src: move BASECHAIN flag toggle to netlink linearize code for device update
The included bogon will crash nft because print side assumes that a BASECHAIN flag presence also means that priority expression is available.
We can either make the print side conditional or move the BASECHAIN setting to the last possible moment.
Fixes a66b5ad9540d ("src: allow for updating devices on existing netdev chain")
Signed-off-by Florian Westphal <[email protected]>
--- src/evaluate.c | 3 --- src/mnl.c | 13 +++++++++---- .../testcases/bogons/nft-f/null_ingress_type_crash | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 tests/shell/testcases/bogons/nft-f/null_ingress_type_crash
src/evaluate.c +0 -3
@@ -6030,9 +6030,6 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain) }if (chain->dev_expr) { -if (!(chain->flags &CHAIN_F_BASECHAIN )) - chain->flags |=CHAIN_F_BASECHAIN ; -if (chain->handle.family ==NFPROTO_NETDEV || (chain->handle.family ==NFPROTO_INET && chain->hook.num ==NF_INET_INGRESS )) {
src/mnl.c +9 -4
@@ -821,6 +821,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, unsigned int flags) {struct nftnl_udata_buf *udbuf; +uint32_t chain_flags =0 ;struct nftnl_chain *nlc;struct nlmsghdr *nlh;int priority, policy;
@@ -846,6 +847,10 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, nftnl_udata_buf_len(udbuf));nftnl_udata_buf_free (udbuf); } + + chain_flags = cmd->chain->flags; +if (cmd->chain->dev_expr) + chain_flags |=CHAIN_F_BASECHAIN ; }nftnl_chain_set_str (nlc,NFTNL_CHAIN_TABLE , cmd->handle.table.name);
@@ -866,7 +871,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,mnl_attr_put_strz (nlh,NFTA_CHAIN_TABLE , cmd->handle.table.name);cmd_add_loc (cmd, nlh, &cmd->handle.chain.location); -if (!cmd->chain || !(cmd->chain->flags &CHAIN_F_BINDING )) { +if (!(chain_flags &CHAIN_F_BINDING )) {mnl_attr_put_strz (nlh,NFTA_CHAIN_NAME , cmd->handle.chain.name); }else {if (cmd->handle.chain.name)
@@ -874,8 +879,8 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, cmd->handle.chain.name);mnl_attr_put_u32 (nlh,NFTA_CHAIN_ID ,htonl (cmd->handle.chain_id)); -if (cmd->chain->flags) -nftnl_chain_set_u32 (nlc,NFTNL_CHAIN_FLAGS , cmd->chain->flags); +if (chain_flags) +nftnl_chain_set_u32 (nlc,NFTNL_CHAIN_FLAGS , chain_flags); }if (cmd->chain && cmd->chain->policy) {
@@ -889,7 +894,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,nftnl_chain_nlmsg_build_payload (nlh, nlc); -if (cmd->chain && cmd->chain->flags &CHAIN_F_BASECHAIN ) { +if (chain_flags &CHAIN_F_BASECHAIN ) {struct nlattr *nest;if (cmd->chain->type.str) {
tests/shell/testcases/bogons/nft-f/null_ingress_type_crash new file +6 -0
@@ -0,0 +1,6 @@ +table netdev filter1 { + chain c { + devices = { lo } + } +} +list ruleset
Signature · 1 line
2.49.0
Pablo Neira Ayuso
maintainerHi Florian,
Quoted 6 lines · Florian Westphal
The included bogon will crash nft because print side assumes that a BASECHAIN flag presence also means that priority expression is available.
We can either make the print side conditional or move the BASECHAIN setting to the last possible moment.
I don't remember to have said otherwise before, but I would go for adding conditional print on priority in this case.
Thanks.
Quoted 91 lines
Fixes a66b5ad9540d ("src: allow for updating devices on existing netdev chain")Signed-off-by Florian Westphal <[email protected]>--- src/evaluate.c | 3 --- src/mnl.c | 13 +++++++++---- .../testcases/bogons/nft-f/null_ingress_type_crash | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 tests/shell/testcases/bogons/nft-f/null_ingress_type_crashsrc/evaluate.c +0
-3@@ -6030,9 +6030,6 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain) }if (chain->dev_expr) { -if (!(chain->flags &CHAIN_F_BASECHAIN )) - chain->flags |=CHAIN_F_BASECHAIN ; -if (chain->handle.family ==NFPROTO_NETDEV || (chain->handle.family ==NFPROTO_INET && chain->hook.num ==NF_INET_INGRESS )) {src/mnl.c +9
-4@@ -821,6 +821,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, unsigned int flags) {struct nftnl_udata_buf *udbuf; +uint32_t chain_flags =0 ;struct nftnl_chain *nlc;struct nlmsghdr *nlh;int priority, policy;@@ -846,6 +847,10 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, nftnl_udata_buf_len(udbuf));nftnl_udata_buf_free (udbuf); } + + chain_flags = cmd->chain->flags; +if (cmd->chain->dev_expr) + chain_flags |=CHAIN_F_BASECHAIN ; }nftnl_chain_set_str (nlc,NFTNL_CHAIN_TABLE , cmd->handle.table.name);@@ -866,7 +871,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,mnl_attr_put_strz (nlh,NFTA_CHAIN_TABLE , cmd->handle.table.name);cmd_add_loc (cmd, nlh, &cmd->handle.chain.location); -if (!cmd->chain || !(cmd->chain->flags &CHAIN_F_BINDING )) { +if (!(chain_flags &CHAIN_F_BINDING )) {mnl_attr_put_strz (nlh,NFTA_CHAIN_NAME , cmd->handle.chain.name); }else {if (cmd->handle.chain.name)@@ -874,8 +879,8 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd, cmd->handle.chain.name);mnl_attr_put_u32 (nlh,NFTA_CHAIN_ID ,htonl (cmd->handle.chain_id)); -if (cmd->chain->flags) -nftnl_chain_set_u32 (nlc,NFTNL_CHAIN_FLAGS , cmd->chain->flags); +if (chain_flags) +nftnl_chain_set_u32 (nlc,NFTNL_CHAIN_FLAGS , chain_flags); }if (cmd->chain && cmd->chain->policy) {@@ -889,7 +894,7 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,nftnl_chain_nlmsg_build_payload (nlh, nlc); -if (cmd->chain && cmd->chain->flags &CHAIN_F_BASECHAIN ) { +if (chain_flags &CHAIN_F_BASECHAIN ) {struct nlattr *nest;if (cmd->chain->type.str) {tests/shell/testcases/bogons/nft-f/null_ingress_type_crash new file +6
-0@@ -0,0 +1,6 @@ +table netdev filter1 { + chain c { + devices = { lo } + } +} +list rulesetSignature · 1 line
2.49.0