[PATCH 1/2] netconfig: Actually use the DNS override values

[PATCH 1/2] netconfig: Actually use the DNS override values

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

In netconfig_load_settings apply the DNS overrides strings we've loaded
instead of leaking them.

Fixes: ad228461abbf ("netconfig: Move loading settings to new method, refactor")
---
 src/netconfig.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/netconfig.c b/src/netconfig.c
index 9bbaece5..c748630b 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -1293,6 +1293,8 @@ bool netconfig_load_settings(struct netconfig *netconfig,
 							mac_address, ETH_ALEN);
 
 	netconfig->active_settings = active_settings;
+	netconfig->dns4_overrides = dns4_overrides;
+	netconfig->dns6_overrides = dns6_overrides;
 	return true;
 
 err_v6_addr:
-- 
2.30.2

Re: [PATCH 1/2] netconfig: Actually use the DNS override values

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

Hi Andrew,

On 9/3/21 3:06 PM, Andrew Zaborowski wrote:
> In netconfig_load_settings apply the DNS overrides strings we've loaded
> instead of leaking them.
> 
> Fixes: ad228461abbf ("netconfig: Move loading settings to new method, refactor")
> ---
>   src/netconfig.c | 2 ++
>   1 file changed, 2 insertions(+)
> 

Both applied, thanks.

Regards,
-Denis

[PATCH 2/2] station: Check ie_tlv_iter_next return value

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

This can't be false but check it to calm static analysis.
---
 src/station.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/station.c b/src/station.c
index 9f00bfb3..afece9eb 100644
--- a/src/station.c
+++ b/src/station.c
@@ -2462,8 +2462,11 @@ static void station_connect_ok(struct station *station)
 
 			ie_tlv_iter_init(&iter, hs->fils_ip_resp_ie,
 						hs->fils_ip_resp_ie[1] + 2);
-			ie_tlv_iter_next(&iter);
-			r = ie_parse_fils_ip_addr_response(&iter, &info);
+			if (!L_WARN_ON(unlikely(!ie_tlv_iter_next(&iter))))
+				r = ie_parse_fils_ip_addr_response(&iter,
+									&info);
+			else
+				r = -ENOMSG;
 
 			if (r != 0)
 				l_debug("Error parsing the FILS IP Address "
-- 
2.30.2