xml: expr: fix mem leak in the expr parser
PATCH 1/1 xml: expr: fix mem leak in the expr parser
There was several mem leaks as reported by valgrind:
==23503== 3 bytes in 1 blocks are definitely lost in loss record 1 of 44
==23503== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==23503== by 0x56F1B41: strdup (strdup.c:43) ==23503== by 0x4E3BE62: nft_rule_expr_exthdr_xml_parse (exthdr.c:212) ==23503== by 0x4E3909A: nft_mxml_expr_parse (mxml.c:49) ==23503== by 0x4E368CC: nft_rule_parse (rule.c:581) ==23503== by 0x401462: main (nft-parsing-test.c:255)
So, once those string are used, do a free.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- src/expr/byteorder.c | 3 +++ src/expr/cmp.c | 3 +++ src/expr/ct.c | 3 +++ src/expr/data_reg.c | 3 +++ src/expr/exthdr.c | 3 +++ src/expr/lookup.c | 1 + src/expr/match.c | 1 + src/expr/meta.c | 3 +++ src/expr/nat.c | 3 +++ src/expr/payload.c | 3 +++ src/expr/target.c | 1 + 11 files changed, 27 insertions(+)
src/expr/byteorder.c +3 -0
@@ -220,6 +220,9 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)return -1 ; ntoh =nft_str2ntoh (op); + +xfree (op); +if (ntoh <0 )return -1 ;
src/expr/cmp.c +3 -0
@@ -193,6 +193,9 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *trereturn -1 ; op_value =nft_str2cmp (op); + +xfree (op); +if (op_value <0 )return -1 ;
src/expr/ct.c +3 -0
@@ -199,6 +199,9 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *treereturn -1 ; key =str2ctkey (key_str); + +xfree (key_str); +if (key <0 ) goto err;
src/expr/data_reg.c +3 -0
@@ -65,6 +65,9 @@ static int nft_data_reg_verdict_xml_parse(union nft_data_reg *reg, char *xml) } verdict =nft_str2verdict (verdict_str); + +xfree (verdict_str); +if (verdict <0 ) {mxmlDelete (tree);return -1 ;
src/expr/exthdr.c +3 -0
@@ -215,6 +215,9 @@ nft_rule_expr_exthdr_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)return -1 ; type =str2exthdr_type (exthdr_type); + +xfree (exthdr_type); +if (type <0 )return -1 ;
src/expr/lookup.c +1 -0
@@ -155,6 +155,7 @@ nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)return -1 ;strncpy (lookup->set_name, set_name,IFNAMSIZ ); +xfree (set_name); lookup->set_name[IFNAMSIZ -1 ] ='\0' ; e->flags |= (1 <<NFT_EXPR_LOOKUP_SET );
src/expr/match.c +1 -0
@@ -181,6 +181,7 @@ static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *treturn -1 ;strncpy (mt->name, name,XT_EXTENSION_MAXNAMELEN ); +xfree (name); mt->name[XT_EXTENSION_MAXNAMELEN -1 ] ='\0' ; e->flags |= (1 <<NFT_EXPR_MT_NAME );
src/expr/meta.c +3 -0
@@ -179,6 +179,9 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *trreturn -1 ; key =str2meta_key (key_str); + +xfree (key_str); +if (key <0 )return -1 ;
src/expr/nat.c +3 -0
@@ -209,6 +209,9 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *trereturn -1 ; nat_type_value =nft_str2nat (nat_type); + +xfree (nat_type); +if (nat_type_value <0 )return -1 ;
src/expr/payload.c +3 -0
@@ -213,6 +213,9 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)return -1 ; base =nft_str2base (base_str); + +xfree (base_str); +if (base <0 )return -1 ;
src/expr/target.c +1 -0
@@ -182,6 +182,7 @@ nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)return -1 ;strncpy (tg->name, name,XT_EXTENSION_MAXNAMELEN ); +xfree (name); tg->name[XT_EXTENSION_MAXNAMELEN -1 ] ='\0' ; e->flags |= (1 <<NFT_EXPR_TG_NAME );
Pablo Neira Ayuso
maintainerHi Arturo,
Quoted 11 lines · Arturo Borrero Gonzalez
There was several mem leaks as reported by valgrind:
==23503== 3 bytes in 1 blocks are definitely lost in loss record 1 of 44
==23503== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==23503== by 0x56F1B41: strdup (strdup.c:43) ==23503== by 0x4E3BE62: nft_rule_expr_exthdr_xml_parse (exthdr.c:212) ==23503== by 0x4E3909A: nft_mxml_expr_parse (mxml.c:49) ==23503== by 0x4E368CC: nft_rule_parse (rule.c:581) ==23503== by 0x401462: main (nft-parsing-test.c:255)So, once those string are used, do a free.
I have fixed this in a different way. Most callers don't seem to need the string duplication, therefore, I decided to remove it. We save the many free invocations that your patch needed. We save some lines of code.
Regards.