33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
|
From 3ec01f287b0b61c0e6d885a7e96dcfa5afa800b8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Fri, 11 Jun 2021 16:46:48 +0200
|
||
|
|
Subject: [PATCH] netlink: Avoid memleak in error path of
|
||
|
|
netlink_delinearize_obj()
|
||
|
|
|
||
|
|
If parsing udata fails, 'obj' has to be freed before returning to
|
||
|
|
caller.
|
||
|
|
|
||
|
|
Fixes: 293c9b114faef ("src: add comment support for objects")
|
||
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||
|
|
(cherry picked from commit 97b5d4bbcac4d3237f114c1c6a57c37968ebe0fc)
|
||
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
||
|
|
---
|
||
|
|
src/netlink.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/netlink.c b/src/netlink.c
|
||
|
|
index fd82b16cb9f6e..4c03baeff5d66 100644
|
||
|
|
--- a/src/netlink.c
|
||
|
|
+++ b/src/netlink.c
|
||
|
|
@@ -1445,6 +1445,7 @@ struct obj *netlink_delinearize_obj(struct netlink_ctx *ctx,
|
||
|
|
udata = nftnl_obj_get_data(nlo, NFTNL_OBJ_USERDATA, &ulen);
|
||
|
|
if (nftnl_udata_parse(udata, ulen, obj_parse_udata_cb, ud) < 0) {
|
||
|
|
netlink_io_error(ctx, NULL, "Cannot parse userdata");
|
||
|
|
+ obj_free(obj);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
if (ud[NFTNL_UDATA_OBJ_COMMENT])
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|