segtree: memleak in error path of the set to segtree conversion
Pablo Neira Ayuso
maintainerPATCH 1/1 segtree: memleak in error path of the set to segtree conversion
Release the array of intervals and the segtree in case of error, otherwise these structures and objects are never released:
SUMMARY: AddressSanitizer: 2864 byte(s) leaked in 37 allocation(s).
Moreover, improve existing a test coverage of this error path.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/segtree.c | 16 ++++++++++++++-- tests/py/inet/ip.t | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-)
src/segtree.c +14 -2
@@ -288,6 +288,7 @@ out:return 0 ; err: +mpz_clear (p); errno =EEXIST ;if (new->expr->etype ==EXPR_MAPPING ) { new_expr = new->expr->left;
@@ -437,7 +438,7 @@ static int set_to_segtree(struct list_head *msgs, struct set *set, {struct elementary_interval **intervals;struct expr *i, *next; -unsigned int n; +unsigned int n, m;int err =0 ;/* We are updating an existing set with new elements, check if the new
@@ -467,8 +468,19 @@ static int set_to_segtree(struct list_head *msgs, struct set *set,*/ for (n =0 ; n < init->size; n++) { err =ei_insert (msgs, tree, intervals[n], merge); -if (err <0 ) +if (err <0 ) { +struct elementary_interval *ei; +struct rb_node *node, *next; + +for (m = n; m < init->size; m++) +ei_destroy (intervals[m]); + +rb_for_each_entry_safe (ei, node, next, &tree->root, rb_node) { +ei_remove (tree, ei); +ei_destroy (ei); + }break ; + } }xfree (intervals);
tests/py/inet/ip.t +1 -1
@@ -8,4 +8,4 @@ ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe };ok ip saddr vmap { 10.0.1.0-10.0.1.255 : accept, 10.0.1.1-10.0.2.255 : drop };fail -ip saddr vmap { 1.1.1.1-1.1.1.255 : accept, 1.1.1.0-1.1.2.1 : drop};fail +ip saddr vmap { 3.3.3.3-3.3.3.4 : accept, 1.1.1.1-1.1.1.255 : accept, 1.1.1.0-1.1.2.1 : drop};fail
Signature · 1 line
2.20.1