src: parser_json: fix crash while restoring secmark object
PATCH v2 1/1 src: parser_json: fix crash while restoring secmark object
Before patch:
# nft -j list ruleset | tee rules.json | jq '.'
{
"nftables": [
{
"metainfo": {
"version": "0.9.2",
"release_name": "Scram",
"json_schema_version": 1
}
},
{
"table": {
"family": "inet",
"name": "t",
"handle": 11
}
},
{
"secmark": {
"family": "inet",
"name": "s",
"table": "t",
"handle": 1,
"context": "system_u:object_r:ssh_server_packet_t:s0"
}
}
]
}# nft flush ruleset # nft -j -f rules.json Segmentation fault
Use "&tmp" instead of "tmp" in json_unpack() while translating "context" keyword.
After patch:
# nft -j -f rules.json
# nft list ruleset
table inet t {
secmark s {
"system_u:object_r:ssh_server_packet_t:s0"
}
}Fixes 3bc84e5c1fdd1 ("src: add support for setting secmark")
Signed-off-by Eric Jallot <[email protected]>
---
v1: Initial patch.
v2: Missing table creation. Use 'ruleset' instead of 'secmarks' to dump rules.
src/parser_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/parser_json.c +1 -1
@@ -3093,7 +3093,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx,break ;case CMD_OBJ_SECMARK : obj->type =NFT_OBJECT_SECMARK ; -if (!json_unpack (root,"{s:s}" ,"context" , tmp)) { +if (!json_unpack (root,"{s:s}" ,"context" , &tmp)) {int ret; ret =snprintf (obj->secmark.ctx,sizeof (obj->secmark.ctx),"%s" , tmp);if (ret <0 || ret >= (int )sizeof (obj->secmark.ctx)) {
Signature · 1 line
2.11.0