diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-20 19:11:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-01 15:35:09 +0300 |
| commit | a702e98833420f386cff1986f1517e8cf6585e25 (patch) | |
| tree | 95ded918e76f7b01cc1588166a0cc795f58a389d | |
| parent | 91addaf5f02b47e82bfd01c4b5100742c5138580 (diff) | |
| download | linux-a702e98833420f386cff1986f1517e8cf6585e25.tar.xz | |
tools: ynl: don't leak mcast_groups on init error
[ Upstream commit 5d78b73e851455d525a064f3b042b29fdc0c1a4a ]
Make sure to free the already-parsed mcast_groups if
we don't get an ack from the kernel when reading family info.
This is part of the ynl_sock_create() error path, so we won't
get a call to ynl_sock_destroy() to free them later.
Fixes: 86878f14d71a ("tools: ynl: user space helpers")
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://lore.kernel.org/r/20240220161112.2735195-3-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | tools/net/ynl/lib/ynl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/net/ynl/lib/ynl.c b/tools/net/ynl/lib/ynl.c index 0a7fe6a13f7b..11a7a889d279 100644 --- a/tools/net/ynl/lib/ynl.c +++ b/tools/net/ynl/lib/ynl.c @@ -572,7 +572,13 @@ static int ynl_sock_read_family(struct ynl_sock *ys, const char *family_name) return err; } - return ynl_recv_ack(ys, err); + err = ynl_recv_ack(ys, err); + if (err < 0) { + free(ys->mcast_groups); + return err; + } + + return 0; } struct ynl_sock * |