json: prevent null deref if chain->policy is not set
Florian Westphal
maintainerPATCH 1/1 json: prevent null deref if chain->policy is not set
The two commits mentioned below resolved null dererence crashes when resolved a null dereference crash when the policy resp. priority keyword was missing in the chain / flowtable specification.
Same issue exists in the json output path, so apply similar fix there and extend the existing test cases.
Fixes 5b37479b42b3 ("nftables: don't crash in 'list ruleset' if policy is not set")
Fixes b40bebbcee36 ("rule: do not crash if to-be-printed flowtable lacks priority")
Signed-off-by Florian Westphal <[email protected]>
--- src/json.c | 19 ++++++++++++++----- .../nft-j-f/flowtable-no-priority-crash | 6 ++++++ .../shell/testcases/nft-f/0021list_ruleset_0 | 7 ++++++- 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 tests/shell/testcases/bogons/nft-j-f/flowtable-no-priority-crash
src/json.c +14 -5
@@ -309,8 +309,14 @@ static json_t *chain_print_json(const struct chain *chain)if (chain->flags &CHAIN_F_BASECHAIN ) {mpz_export_data (&priority, chain->priority.expr->value,BYTEORDER_HOST_ENDIAN ,sizeof (int )); -mpz_export_data (&policy, chain->policy->value, -BYTEORDER_HOST_ENDIAN ,sizeof (int )); + +if (chain->policy) { +mpz_export_data (&policy, chain->policy->value, +BYTEORDER_HOST_ENDIAN ,sizeof (int )); + }else { + policy =NF_ACCEPT ; + } + tmp = nft_json_pack("{s:s, s:s, s:i, s:s}", "type", chain->type.str, "hook", hooknum2str(chain->handle.family,
@@ -485,10 +491,13 @@ static json_t *obj_print_json(const struct obj *obj)static json_t *flowtable_print_json (const struct flowtable *ftable) {json_t *root, *devs =NULL ; -int i, priority; +int i, priority =0 ; + +if (ftable->priority.expr) { +mpz_export_data (&priority, ftable->priority.expr->value, +BYTEORDER_HOST_ENDIAN ,sizeof (int )); + } -mpz_export_data (&priority, ftable->priority.expr->value, -BYTEORDER_HOST_ENDIAN ,sizeof (int )); root = nft_json_pack("{s:s, s:s, s:s, s:I, s:s, s:i}", "family", family2str(ftable->handle.family), "name", ftable->handle.flowtable.name,
tests/shell/testcases/bogons/nft-j-f/flowtable-no-priority-crash new file +6 -0
@@ -0,0 +1,6 @@ +table ip filter { + flowtable ft1 { + devices = { lo } + } +} +list ruleset
tests/shell/testcases/nft-f/0021list_ruleset_0 +6 -1
@@ -12,4 +12,9 @@ RULESET="table filter { list ruleset " -exec $NFT -f - <<< "$RULESET" +$NFT -f - <<< "$RULESET" + +if [ "$NFT_TEST_HAVE_json" != n ]; then + $NFT flush ruleset + $NFT -j -f - <<< "$RULESET" +fi
Signature · 1 line
2.49.0
Quoted 10 lines · Florian Westphal
The two commits mentioned below resolved null dererence crashes when resolved a null dereference crash when the policy resp. priority keyword was missing in the chain / flowtable specification.
Same issue exists in the json output path, so apply similar fix there and extend the existing test cases.
Fixes 5b37479b42b3 ("nftables: don't crash in 'list ruleset' if policy is not set")Fixes b40bebbcee36 ("rule: do not crash if to-be-printed flowtable lacks priority")Signed-off-by Florian Westphal <[email protected]>
Acked-by Phil Sutter <[email protected]>
Thanks, Phil