aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrii Nakryiko <andrii@kernel.org>2022-02-16 23:39:58 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2022-02-17 16:09:07 +0100
commit1b8c924a05934d2e758ec7da7bd217ef8ebd80ce (patch)
tree923f14c801fdd8f454ef2d8e23954146d65ac78b
parentbpftool: Fix C++ additions to skeleton (diff)
downloadlinux-dev-1b8c924a05934d2e758ec7da7bd217ef8ebd80ce.tar.xz
linux-dev-1b8c924a05934d2e758ec7da7bd217ef8ebd80ce.zip
libbpf: Fix memleak in libbpf_netlink_recv()
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
-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 a598061f6fea..cbc8967d5402 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;
}
}
}