ethtool: fix leakage of strings resources in do_sprivflags
Coverity issue: 1363124
Fixes: e1ee596326ae ("Add support for querying and setting private flags")
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Reviewed-by: Greg Rose <grose@lightfleet.com>
diff --git a/ethtool.c b/ethtool.c
index c89f446..b8de652 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -4283,7 +4283,7 @@
struct cmdline_info *cmdline;
struct ethtool_value flags;
u32 wanted_flags = 0, seen_flags = 0;
- int any_changed;
+ int any_changed, rc;
unsigned int i;
strings = get_stringset(ctx, ETH_SS_PRIV_FLAGS,
@@ -4295,7 +4295,8 @@
}
if (strings->len == 0) {
fprintf(stderr, "No private flags defined\n");
- return 1;
+ rc = 1;
+ goto err;
}
if (strings->len > 32) {
/* ETHTOOL_{G,S}PFLAGS can only cover 32 flags */
@@ -4306,7 +4307,8 @@
cmdline = calloc(strings->len, sizeof(*cmdline));
if (!cmdline) {
perror("Cannot parse arguments");
- return 1;
+ rc = 1;
+ goto err;
}
for (i = 0; i < strings->len; i++) {
cmdline[i].name = ((const char *)strings->data +
@@ -4322,17 +4324,22 @@
flags.cmd = ETHTOOL_GPFLAGS;
if (send_ioctl(ctx, &flags)) {
perror("Cannot get private flags");
- return 1;
+ rc = 1;
+ goto err;
}
flags.cmd = ETHTOOL_SPFLAGS;
flags.data = (flags.data & ~seen_flags) | wanted_flags;
if (send_ioctl(ctx, &flags)) {
perror("Cannot set private flags");
- return 1;
+ rc = 1;
+ goto err;
}
- return 0;
+ rc = 0;
+err:
+ free(strings);
+ return rc;
}
static int do_tsinfo(struct cmd_context *ctx)
