[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <853fd3b0ec3d38ee5ffbdc95abc0367dd05db7d3.1682894692.git.nvinson234@gmail.com>
Date: Sun, 30 Apr 2023 18:50:51 -0400
From: Nicholas Vinson <nvinson234@...il.com>
To: mkubecek@...e.cz
Cc: Nicholas Vinson <nvinson234@...il.com>, netdev@...r.kernel.org
Subject: [PATCH ethtool 2/3] Fix reported memory leak.
Found via gcc -fanalyzer. In the function nl_sfeatures() malloc() is
called to allocate a block of memory; however, that memory block is
never explictily freed.
Signed-off-by: Nicholas Vinson <nvinson234@...il.com>
---
netlink/features.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/netlink/features.c b/netlink/features.c
index a93f3e7..5711ff4 100644
--- a/netlink/features.c
+++ b/netlink/features.c
@@ -534,24 +534,36 @@ int nl_sfeatures(struct cmd_context *ctx)
nlctx->devname = ctx->devname;
ret = msg_init(nlctx, msgbuff, ETHTOOL_MSG_FEATURES_SET,
NLM_F_REQUEST | NLM_F_ACK);
- if (ret < 0)
+ if (ret < 0) {
+ free(sfctx);
return 2;
+ }
if (ethnla_fill_header(msgbuff, ETHTOOL_A_FEATURES_HEADER, ctx->devname,
- ETHTOOL_FLAG_COMPACT_BITSETS))
+ ETHTOOL_FLAG_COMPACT_BITSETS)) {
+ free(sfctx);
return -EMSGSIZE;
+ }
ret = fill_sfeatures_bitmap(nlctx, feature_names);
- if (ret < 0)
+ if (ret < 0) {
+ free(sfctx);
return ret;
+ }
ret = nlsock_sendmsg(nlsk, NULL);
- if (ret < 0)
+ if (ret < 0) {
+ free(sfctx);
return 92;
+ }
ret = nlsock_process_reply(nlsk, sfeatures_reply_cb, nlctx);
if (sfctx->nothing_changed) {
fprintf(stderr, "Could not change any device features\n");
+ free(sfctx);
return nlctx->exit_code ?: 1;
}
- if (ret == 0)
+ if (ret == 0) {
+ free(sfctx);
return 0;
+ }
+ free(sfctx);
return nlctx->exit_code ?: 92;
}
--
2.40.1
Powered by blists - more mailing lists