2021-04-10 11:21:30

by Benjamin Aschenbrenner

Subject: [PATCH v2 1/2] iw: fix mgmt dump missing arguments segfault

When expected arguments for mgmt command dump are left out iw segfaults.

Example: iw dev wlp2s0 mgmt dump frame e0

This fixes it.

Signed-off-by: Benjamin Aschenbrenner <[email protected]>
---
mgmt.c | 41 +++++++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/mgmt.c b/mgmt.c
index 338435d..677afb8 100644
--- a/mgmt.c
+++ b/mgmt.c
@@ -54,6 +54,9 @@ static int register_mgmt_frame(struct nl80211_state *state,
size_t match_len;
int ret;

+ if (argc < 2)
+ return HANDLER_RET_USAGE;
+
ret = sscanf(argv[0], "%x", &type);
if (ret != 1) {
printf("invalid frame type: %s\n", argv[0]);
@@ -96,7 +99,6 @@ static int handle_mgmt_dump(struct nl80211_state *state,
char **mgmt_argv;
unsigned int count = 0;
int err = 0;
- int i;

mgmt_argv = calloc(mgmt_argc, sizeof(char*));
if (!mgmt_argv)
@@ -106,27 +108,42 @@ static int handle_mgmt_dump(struct nl80211_state *state,
mgmt_argv[1] = "mgmt";
mgmt_argv[2] = "reg";

- for (i = 3; i < argc; i += 3) {
- if (strcmp(argv[i], "count") == 0) {
- count = 1 + atoi(argv[i + 1]);
- if (count < 1)
- count = 1;
- break;
- }
+ if (argc < 6) {
+ err = HANDLER_RET_USAGE;
+ goto out;
+ }

- if (strcmp(argv[i], "frame") != 0) {
- err = 1;
+ argc -= 3;
+ argv += 3;
+ while (argc >= 3) {
+ if (strcmp(argv[0], "frame") != 0) {
+ err = HANDLER_RET_USAGE;
goto out;
}

- mgmt_argv[3] = argv[i + 1];
- mgmt_argv[4] = argv[i + 2];
+ mgmt_argv[3] = argv[1];
+ mgmt_argv[4] = argv[2];
+
+ argc -= 3;
+ argv += 3;

err = handle_cmd(state, II_NETDEV, mgmt_argc, mgmt_argv);
if (err)
goto out;
}

+ if (argc == 2 && strcmp(argv[0], "count") == 0) {
+ count = 1 + atoi(argv[1]);
+ if (count < 1)
+ count = 1;
+
+ argc -= 2;
+ argv += 2;
+ } else if (argc) {
+ err = HANDLER_RET_USAGE;
+ goto out;
+ }
+
mgmt_cb = nl_cb_alloc(iw_debug ? NL_CB_DEBUG : NL_CB_DEFAULT);
if (!mgmt_cb) {
err = 1;
--
2.30.2

2021-04-10 11:22:59

by Benjamin Aschenbrenner

Subject: [PATCH v2 2/2] iw: fix ftm_request missing arguments segfault

When expected argument <config-file> is not passed to arguemts iw
segfaults.

Example: iw wlp2s0 measurement ftm_request

This fixes it.

Signed-off-by: Benjamin Aschenbrenner <[email protected]>
---
measurements.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/measurements.c b/measurements.c
index 635d942..80fe785 100644
--- a/measurements.c
+++ b/measurements.c
@@ -282,6 +282,9 @@ static int handle_ftm_req_send(struct nl80211_state *state, struct nl_msg *msg,
const char *file;
int err;

+ if (argc < 1)
+ return HANDLER_RET_USAGE;
+
file = argv[0];
argc--;
argv++;
--
2.30.2