diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-09-14 16:09:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-09-19 17:26:27 +0200 |
| commit | a76c8960905ef6803c0c79df7bc0a030209c9455 (patch) | |
| tree | 685ed0a942f6e8b5724791989acf171f201bf56e /src/netlink.c | |
| parent | 6d19a902c1d77cb51b940b1ce65f31b1cad38b74 (diff) | |
netlink: fix leaking typeof_expr_data/typeof_expr_key in netlink_delinearize_set()
There are various code paths that return without freeing typeof_expr_data
and typeof_expr_key. It's not at all obvious, that there isn't a leak
that way. Quite possibly there is a leak. Fix it, or at least make the
code more obviously correct.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/netlink.c')
| -rw-r--r-- | src/netlink.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/netlink.c b/src/netlink.c index 4d3c1cf1..2489e986 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -937,12 +937,13 @@ struct set *netlink_delinearize_set(struct netlink_ctx *ctx, const struct nftnl_udata *ud[NFTNL_UDATA_SET_MAX + 1] = {}; enum byteorder keybyteorder = BYTEORDER_INVALID; enum byteorder databyteorder = BYTEORDER_INVALID; - struct expr *typeof_expr_key, *typeof_expr_data; struct setelem_parse_ctx set_parse_ctx; const struct datatype *datatype = NULL; const struct datatype *keytype = NULL; const struct datatype *dtype2 = NULL; const struct datatype *dtype = NULL; + struct expr *typeof_expr_data = NULL; + struct expr *typeof_expr_key = NULL; const char *udata, *comment = NULL; uint32_t flags, key, objtype = 0; uint32_t data_interval = 0; @@ -951,9 +952,6 @@ struct set *netlink_delinearize_set(struct netlink_ctx *ctx, uint32_t ulen; uint32_t klen; - typeof_expr_key = NULL; - typeof_expr_data = NULL; - if (nftnl_set_is_set(nls, NFTNL_SET_USERDATA)) { udata = nftnl_set_get_data(nls, NFTNL_SET_USERDATA, &ulen); if (nftnl_udata_parse(udata, ulen, set_parse_udata_cb, ud) < 0) { @@ -1043,8 +1041,8 @@ struct set *netlink_delinearize_set(struct netlink_ctx *ctx, if (set_udata_key_valid(typeof_expr_data, dlen)) { typeof_expr_data->len = klen; set->data = typeof_expr_data; + typeof_expr_data = NULL; } else { - expr_free(typeof_expr_data); set->data = constant_expr_alloc(&netlink_location, dtype2, databyteorder, klen, @@ -1064,9 +1062,9 @@ struct set *netlink_delinearize_set(struct netlink_ctx *ctx, if (set_udata_key_valid(typeof_expr_key, klen)) { set->key = typeof_expr_key; + typeof_expr_key = NULL; set->key_typeof_valid = true; } else { - expr_free(typeof_expr_key); set->key = constant_expr_alloc(&netlink_location, dtype, keybyteorder, klen, NULL); @@ -1100,6 +1098,8 @@ struct set *netlink_delinearize_set(struct netlink_ctx *ctx, } out: + expr_free(typeof_expr_data); + expr_free(typeof_expr_key); datatype_free(datatype); datatype_free(keytype); datatype_free(dtype2); |