From: "John W. Linville" <linville@tuxdriver.com>
To: netdev@vger.kernel.org
Cc: Jarod Wilson <jarod@redhat.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH v2 2/7] ethtool: avoid resource leak of strings in do_gprivflags
Date: Tue, 4 Oct 2016 10:05:17 -0400 [thread overview]
Message-ID: <1475589917-20882-1-git-send-email-linville@tuxdriver.com> (raw)
In-Reply-To: <1475265381-28937-3-git-send-email-linville@tuxdriver.com>
Coverity issue: 1363119
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>
---
ethtool.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index aa3ef5ed2f75..7ce5667fcdd7 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -4205,7 +4205,7 @@ static int do_gprivflags(struct cmd_context *ctx)
struct ethtool_gstrings *strings;
struct ethtool_value flags;
unsigned int i;
- int max_len = 0, cur_len;
+ int max_len = 0, cur_len, rc;
if (ctx->argc != 0)
exit_bad_args();
@@ -4219,7 +4219,8 @@ static int do_gprivflags(struct cmd_context *ctx)
}
if (strings->len == 0) {
fprintf(stderr, "No private flags defined\n");
- return 1;
+ rc = 1;
+ goto err;
}
if (strings->len > 32) {
/* ETHTOOL_GPFLAGS can only cover 32 flags */
@@ -4230,7 +4231,8 @@ static int do_gprivflags(struct cmd_context *ctx)
flags.cmd = ETHTOOL_GPFLAGS;
if (send_ioctl(ctx, &flags)) {
perror("Cannot get private flags");
- return 1;
+ rc = 1;
+ goto err;
}
/* Find longest string and align all strings accordingly */
@@ -4248,7 +4250,11 @@ static int do_gprivflags(struct cmd_context *ctx)
(const char *)strings->data + i * ETH_GSTRING_LEN,
(flags.data & (1U << i)) ? "on" : "off");
- return 0;
+ rc = 0;
+
+err:
+ free(strings);
+ return rc;
}
static int do_sprivflags(struct cmd_context *ctx)
--
2.7.4
next prev parent reply other threads:[~2016-10-04 14:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 19:56 [PATCH 0/7] ethtool: misc fixes for Coverity issues John W. Linville
2016-09-30 19:56 ` [PATCH 1/7] ethtool: avoid NULL pointer dereference in do_permaddr John W. Linville
2016-09-30 19:56 ` [PATCH 2/7] ethtool: avoid resource leak of strings in do_gprivflags John W. Linville
2016-10-03 17:54 ` Jarod Wilson
2016-10-04 14:02 ` John W. Linville
2016-10-04 14:05 ` John W. Linville [this message]
2016-09-30 19:56 ` [PATCH 3/7] ethtool: plug resource leaks of defs and features in do_gfeatures John W. Linville
2016-09-30 19:56 ` [PATCH 4/7] ethtool: fix leakage of defs resources in do_sfeatures John W. Linville
2016-09-30 19:56 ` [PATCH 5/7] ethtool: fix leakage of efeatures " John W. Linville
2016-09-30 19:56 ` [PATCH 6/7] ethtool: fix leakage of strings resources in do_sprivflags John W. Linville
2016-09-30 19:56 ` [PATCH 7/7] ethtool: fix leakage of strings resources in get_feature_defs John W. Linville
2016-09-30 20:26 ` [PATCH 0/7] ethtool: misc fixes for Coverity issues Greg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475589917-20882-1-git-send-email-linville@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=jarod@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).