]> git.itanic.dy.fi Git - linux-stable/commitdiff
tools: ynl: don't leak mcast_groups on init error
authorJakub Kicinski <kuba@kernel.org>
Tue, 20 Feb 2024 16:11:12 +0000 (08:11 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Feb 2024 01:02:28 +0000 (17:02 -0800)
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>
tools/net/ynl/lib/ynl.c

index 9e41c8c0cc99fd804e46a789d0dfe4cba0cbd6a4..6e6d474c83664741a5de5192c410afefe35cc5ad 100644 (file)
@@ -588,7 +588,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 *