rule: memleak of list of timeout policies

Release list of ct timeout policy when object is freed.

Direct leak of 160 byte(s) in 2 object(s) allocated from:
    #0 0x7fc0273ad330 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xe9330)
    #1 0x7fc0231377c4 in xmalloc /home/.../devel/nftables/src/utils.c:36
    #2 0x7fc023137983 in xzalloc /home/.../devel/nftables/src/utils.c:75
    #3 0x7fc0231f64d6 in nft_parse /home/.../devel/nftables/src/parser_bison.y:4448

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/netlink.c b/src/netlink.c
index f2c1a4a15dee8f2e33697d530170e8306ad0171b..c5fd38044b412683b6a96c1a8bbe9821d1f65621 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1484,6 +1484,7 @@ struct obj *netlink_delinearize_obj(struct netlink_ctx *ctx,
                obj->ct_helper.l4proto = nftnl_obj_get_u8(nlo, NFTNL_OBJ_CT_HELPER_L4PROTO);
                break;
        case NFT_OBJECT_CT_TIMEOUT:
+               init_list_head(&obj->ct_timeout.timeout_list);
                obj->ct_timeout.l3proto = nftnl_obj_get_u16(nlo, NFTNL_OBJ_CT_TIMEOUT_L3PROTO);
                obj->ct_timeout.l4proto = nftnl_obj_get_u8(nlo, NFTNL_OBJ_CT_TIMEOUT_L4PROTO);
                memcpy(obj->ct_timeout.timeout,

diff --git a/src/rule.c b/src/rule.c
index 92daf2f33b76b3f94bd00e0ceb031532dff629d2..10569aa7875a455c300d59a75be7bb3a3da3bea0 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -1709,6 +1709,14 @@ void obj_free(struct obj *obj)
                return;
        xfree(obj->comment);
        handle_free(&obj->handle);
+       if (obj->type == NFT_OBJECT_CT_TIMEOUT) {
+               struct timeout_state *ts, *next;
+
+               list_for_each_entry_safe(ts, next, &obj->ct_timeout.timeout_list, head) {
+                       list_del(&ts->head);
+                       xfree(ts);
+               }
+       }
        xfree(obj);
 }