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>

diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c
index 69b353d55dbf608bed8af9bb66e92e4389c338e2..fadde7d80a51ca1ad1367cbd880acd9b60ba6f03 100644 (file)
--- 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;
                                }
                        }
                }