summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndrii Nakryiko <andrii@kernel.org>2022-02-16 23:39:58 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-08 13:58:07 +0200
commitc3d665699e872061bdcd014fb462188d66b94b57 (patch)
tree0918f4e93747034698507e57c39b5b6b2b4ab5d3 /tools
parent0da0a33b87d1a0715bd5e18c3b77e8dafe8319a7 (diff)
downloadlinux-stable-c3d665699e872061bdcd014fb462188d66b94b57.tar.gz
linux-stable-c3d665699e872061bdcd014fb462188d66b94b57.tar.bz2
linux-stable-c3d665699e872061bdcd014fb462188d66b94b57.zip
libbpf: Fix memleak in libbpf_netlink_recv()
[ Upstream commit 1b8c924a05934d2e758ec7da7bd217ef8ebd80ce ] Ensure that libbpf_netlink_recv() frees dynamically allocated buffer in all code paths. Fixes: 9c3de619e13e ("libbpf: Use dynamically allocated buffer when receiving netlink messages") Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com> Link: https://lore.kernel.org/bpf/20220217073958.276959-1-andrii@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/bpf/netlink.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c
index 69b353d55dbf..fadde7d80a51 100644
--- a/tools/lib/bpf/netlink.c
+++ b/tools/lib/bpf/netlink.c
@@ -176,7 +176,8 @@ start:
libbpf_nla_dump_errormsg(nh);
goto done;
case NLMSG_DONE:
- return 0;
+ ret = 0;
+ goto done;
default:
break;
}
@@ -188,9 +189,10 @@ start:
case NL_NEXT:
goto start;
case NL_DONE:
- return 0;
+ ret = 0;
+ goto done;
default:
- return ret;
+ goto done;
}
}
}