From: John Crispin <john@phrozen.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, John Crispin <john@phrozen.org>
Subject: [PATCH 3/7] iw: fix memory leak inside handle_cac
Date: Fri, 17 May 2019 21:29:52 +0200 [thread overview]
Message-ID: <20190517192956.18372-4-john@phrozen.org> (raw)
In-Reply-To: <20190517192956.18372-1-john@phrozen.org>
Signed-off-by: John Crispin <john@phrozen.org>
---
phy.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/phy.c b/phy.c
index 77df7a7..a4425ea 100644
--- a/phy.c
+++ b/phy.c
@@ -328,12 +328,15 @@ static int handle_cac(struct nl80211_state *state,
} else if (strcmp(argv[2], "freq") == 0) {
err = parse_freqchan(&chandef, false, argc - 3, argv + 3, NULL);
} else {
- return 1;
+ err = 1;
+ goto err_out;
}
cac_trigger_argv = calloc(argc + 1, sizeof(char*));
- if (!cac_trigger_argv)
- return -ENOMEM;
+ if (!cac_trigger_argv) {
+ err = -ENOMEM;
+ goto err_out;
+ }
cac_trigger_argv[0] = argv[0];
cac_trigger_argv[1] = "cac";
@@ -341,9 +344,8 @@ static int handle_cac(struct nl80211_state *state,
memcpy(&cac_trigger_argv[3], &argv[2], (argc - 2) * sizeof(char*));
err = handle_cmd(state, id, argc + 1, cac_trigger_argv);
- free(cac_trigger_argv);
if (err)
- return err;
+ goto err_out;
cac_event.ret = 1;
cac_event.freq = chandef.control_freq;
@@ -357,7 +359,13 @@ static int handle_cac(struct nl80211_state *state,
while (cac_event.ret > 0)
nl_recvmsgs(state->nl_sock, radar_cb);
- return 0;
+ err = 0;
+err_out:
+ if (radar_cb)
+ nl_cb_put(radar_cb);
+ if (cac_trigger_argv)
+ free(cac_trigger_argv);
+ return err;
}
TOPLEVEL(cac, "channel <channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
"freq <freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
--
2.20.1
next prev parent reply other threads:[~2019-05-17 19:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 19:29 [PATCH 0/7] iw: various bug fixes John Crispin
2019-05-17 19:29 ` [PATCH 1/7] iw: fix memory leak inside register_mgmt_frame John Crispin
2019-05-17 19:29 ` [PATCH 2/7] iw: fix endless loop inside handle_mgmt_dump John Crispin
2019-05-17 19:29 ` John Crispin [this message]
2019-05-17 19:29 ` [PATCH 4/7] iw: fix fd leak inside handle_netns John Crispin
2019-05-17 19:29 ` [PATCH 5/7] iw: fix memory leak inside parse_sched_scan John Crispin
2019-05-17 19:29 ` [PATCH 6/7] iw: fix memory leaks inside handle_scan John Crispin
2019-05-17 19:29 ` [PATCH 7/7] iw: fix fp handling inside handle_vendor John Crispin
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=20190517192956.18372-4-john@phrozen.org \
--to=john@phrozen.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@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).