[PATCH] iwd: Fix connection with no passphrase

[PATCH] iwd: Fix connection with no passphrase

[VAUTRIN Emmanuel (Canal Plus Prestataire)]

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

During a failing connection on a secure network with no passphrase,
agent_request_passphrase() crashes, trying to manipulate the value
of the "WiFi.Passphrase" key, which is null.
---
 plugins/iwd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/iwd.c b/plugins/iwd.c
index b0e17a4d6396..b524a731fb92 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -1489,6 +1489,8 @@ static DBusMessage *agent_request_passphrase(DBusConnection *dbus_conn,
                 return get_reply_on_error(message, EINVAL);
 
         passwd = connman_network_get_string(iwdn->network, "WiFi.Passphrase");
+       if (!passwd)
+               return get_reply_on_error(message, ENOKEY);
 
         return g_dbus_create_reply(message, DBUS_TYPE_STRING, &passwd,
                                         DBUS_TYPE_INVALID);
-- 
2.25.1
Hi,

Same problem here, I attach the patch.

Best Regards,

Emmanuel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-iwd-Fix-connection-with-no-passphrase.patch --]
[-- Type: text/x-patch; name="0001-iwd-Fix-connection-with-no-passphrase.patch", Size: 967 bytes --]

From b2a5e64a1e79b0c112e764e691050a63ae9e49ec Mon Sep 17 00:00:00 2001
From: Emmanuel VAUTRIN <Emmanuel.VAUTRIN@cpexterne.org>
Date: Thu, 6 Jan 2022 15:11:34 +0100
Subject: [PATCH] iwd: Fix connection with no passphrase

During a failing connection on a secure network with no passphrase,
agent_request_passphrase() crashes, trying to manipulate the value
of the "WiFi.Passphrase" key, which is null.
---
 plugins/iwd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/iwd.c b/plugins/iwd.c
index b0e17a4d6396..b524a731fb92 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -1489,6 +1489,8 @@ static DBusMessage *agent_request_passphrase(DBusConnection *dbus_conn,
 		return get_reply_on_error(message, EINVAL);
 
 	passwd = connman_network_get_string(iwdn->network, "WiFi.Passphrase");
+	if (!passwd)
+		return get_reply_on_error(message, ENOKEY);
 
 	return g_dbus_create_reply(message, DBUS_TYPE_STRING, &passwd,
 					DBUS_TYPE_INVALID);
-- 
2.25.1

Re: [PATCH] iwd: Fix connection with no passphrase

[Michael Nazzareno Trimarchi]

Hi

On Tue, Jan 18, 2022 at 12:01 PM VAUTRIN Emmanuel (Canal Plus
Prestataire) <Emmanuel.VAUTRIN@cpexterne.org> wrote:
>
> During a failing connection on a secure network with no passphrase,
> agent_request_passphrase() crashes, trying to manipulate the value
> of the "WiFi.Passphrase" key, which is null.
> ---
>  plugins/iwd.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/plugins/iwd.c b/plugins/iwd.c
> index b0e17a4d6396..b524a731fb92 100644
> --- a/plugins/iwd.c
> +++ b/plugins/iwd.c
> @@ -1489,6 +1489,8 @@ static DBusMessage *agent_request_passphrase(DBusConnection *dbus_conn,
>                  return get_reply_on_error(message, EINVAL);
>
>          passwd = connman_network_get_string(iwdn->network, "WiFi.Passphrase");
> +       if (!passwd)
> +               return get_reply_on_error(message, ENOKEY);
>
>          return g_dbus_create_reply(message, DBUS_TYPE_STRING, &passwd,
>                                          DBUS_TYPE_INVALID);
> --
> 2.25.1

I don't know if we have some Reviewed-by: Michael Trimarchi
<michael@amarulasolutions.com>

Michael

> Hi,
>
> Same problem here, I attach the patch.
>
> Best Regards,
>
> Emmanuel



-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com

Re: [PATCH] iwd: Fix connection with no passphrase

[Daniel Wagner]

On Tue, Jan 18, 2022 at 12:03:12PM +0100, Michael Nazzareno Trimarchi wrote:
> On Tue, Jan 18, 2022 at 12:01 PM VAUTRIN Emmanuel (Canal Plus
> Prestataire) <Emmanuel.VAUTRIN@cpexterne.org> wrote:
> >
> > During a failing connection on a secure network with no passphrase,
> > agent_request_passphrase() crashes, trying to manipulate the value
> > of the "WiFi.Passphrase" key, which is null.

Patch applied.

> I don't know if we have some Reviewed-by: Michael Trimarchi
> <michael@amarulasolutions.com>

No, we didn't do this SoB & Co stuff so far. IIRC it is something Intel
sponsored projects do. Though this is project is complete independent by
now. I haven't really spend any time figuring out the legal stuff. Hence
I didn't wanted to start adding SoB. The reviewed tag seems not to touch
any of the legal stuff. Added it :)

Daniel

RE: [PATCH] iwd: Fix connection with no passphrase

[VAUTRIN Emmanuel (Canal Plus Prestataire)]

> Patch applied.
Great, thank you Daniel!