8:19 p.m.
If 'entry' exceeds the length of 'line' we could overflow. Instead
use l_strlcpy and pass in the remaining amount of data left in
the buffer.
---
client/display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/display.c b/client/display.c
index 88bc913f..961ad419 100644
--- a/client/display.c
+++ b/client/display.c
@@ -419,7 +419,7 @@ static void display_completion_matches(char **matches, int
num_matches,
}
entry = l_strdup_printf("%-*s ", max_length, matches[index]);
- strcpy(&line[line_used], entry);
+ l_strlcpy(&line[line_used], entry, sizeof(line) - line_used);
l_free(entry);
line_used += max_length + 1;
--
2.26.2
8:19 p.m.
New subject: [PATCH 2/5] client: check mkdir return in display_init
Printing a warning is about all that we can do at this
point during initialization.
---
client/display.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/client/display.c b/client/display.c
index 961ad419..4b9ee8f0 100644
--- a/client/display.c
+++ b/client/display.c
@@ -681,6 +681,7 @@ void display_init(void)
{
const char *data_home;
char *data_path;
+ int ret;
display_refresh.redo_entries = l_queue_new();
@@ -701,7 +702,12 @@ void display_init(void)
}
if (data_path) {
- mkdir(data_path, 0700);
+ ret = mkdir(data_path, 0700);
+ /* Not much can be done since display isn't even initialized */
+ if (L_WARN_ON(ret < 0)) {
+ l_free(data_path);
+ return;
+ }
history_path = l_strdup_printf("%s/history", data_path);
read_history(history_path);
--
2.26.2
8:19 p.m.
New subject: [PATCH 3/5] adhoc: fix missing call to va_end
---
src/adhoc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/adhoc.c b/src/adhoc.c
index 7f9ce765..1263d00a 100644
--- a/src/adhoc.c
+++ b/src/adhoc.c
@@ -228,6 +228,8 @@ static void adhoc_handshake_event(struct handshake_state *hs,
default:
break;
}
+
+ va_end(args);
}
static struct eapol_sm *adhoc_new_sm(struct sta_state *sta, bool authenticator,
--
2.26.2
8:25 p.m.
New subject: [PATCH 3/5] adhoc: fix missing call to va_end
Hi James,
On 2/8/21 2:19 PM, James Prestwood wrote:
---
src/adhoc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/adhoc.c b/src/adhoc.c
index 7f9ce765..1263d00a 100644
--- a/src/adhoc.c
+++ b/src/adhoc.c
@@ -228,6 +228,8 @@ static void adhoc_handshake_event(struct handshake_state *hs,
default:
break;
}
+
+ va_end(args);
I don't think this is correct since there are multiple returns from this
function. Perhaps the va_start should be moved to the error cases where it is used.
}
static struct eapol_sm *adhoc_new_sm(struct sta_state *sta, bool authenticator,
Regards,
-Denis
8:19 p.m.
New subject: [PATCH 4/5] ap: free passphrase on error
---
src/ap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ap.c b/src/ap.c
index 8ea26a0d..162b456b 100644
--- a/src/ap.c
+++ b/src/ap.c
@@ -2568,6 +2568,7 @@ static int ap_load_profile_and_dhcp(struct ap_state *ap, bool
*wait_dhcp)
if (strlen(passphrase) > 63) {
l_error("[Security].Passphrase must not exceed "
"63 characters");
+ l_free(passphrase);
return -EINVAL;
}
--
2.26.2
8:19 p.m.
New subject: [PATCH 5/5] ap: massage code to make static analysis happy
There is no functional change here but checking the return
value makes static analysis much happier. Checking the
return and setting the default inside the if clause is also
consistent with how IWD does it many other places.
---
src/ap.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/ap.c b/src/ap.c
index 162b456b..407a2596 100644
--- a/src/ap.c
+++ b/src/ap.c
@@ -3305,7 +3305,7 @@ static void ap_netdev_watch(struct netdev *netdev,
static int ap_init(void)
{
const struct l_settings *settings = iwd_get_config();
- bool dhcp_enable = false;
+ bool dhcp_enable;
netdev_watch = netdev_watch_add(ap_netdev_watch, NULL, NULL);
@@ -3320,8 +3320,9 @@ static int ap_init(void)
* DHCP server. If no value is found or it is false do not create a
* DHCP server.
*/
- l_settings_get_bool(settings, "General",
"EnableNetworkConfiguration",
- &dhcp_enable);
+ if (!l_settings_get_bool(settings, "General",
+ "EnableNetworkConfiguration", &dhcp_enable))
+ dhcp_enable = false;
if (dhcp_enable) {
L_AUTO_FREE_VAR(char *, ip_prefix);
--
2.26.2
8:26 p.m.
Hi James,
On 2/8/21 2:19 PM, James Prestwood wrote:
If 'entry' exceeds the length of 'line' we could
overflow. Instead
use l_strlcpy and pass in the remaining amount of data left in
the buffer.
---
client/display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Patches 1,2,4,5 applied, thanks.
Regards,
-Denis
503
days inactive
503
days old
6 comments
2 participants
participants (2)
-
Denis Kenzior -
James Prestwood