linux-kernel - Re: [EXT] Re: [PATCH v10 2/2] wifi: mwifiex: add host mlme for AP mode

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Zmvjw3aG9j8kW0Ld@pengutronix.de>
Date: Fri, 14 Jun 2024 08:31:31 +0200
From: Sascha Hauer <s.hauer@...gutronix.de>
To: David Lin <yu-hao.lin@....com>
Cc: "linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"briannorris@...omium.org" <briannorris@...omium.org>,
	"kvalo@...nel.org" <kvalo@...nel.org>,
	"francesco@...cini.it" <francesco@...cini.it>,
	Pete Hsieh <tsung-hsien.hsieh@....com>,
	Francesco Dolcini <francesco.dolcini@...adex.com>
Subject: Re: [EXT] Re: [PATCH v10 2/2] wifi: mwifiex: add host mlme for AP
 mode

On Fri, Jun 14, 2024 at 02:06:45AM +0000, David Lin wrote:
> > From: Sascha Hauer <s.hauer@...gutronix.de>
> > Sent: Wednesday, June 12, 2024 9:12 PM
> > To: David Lin <yu-hao.lin@....com>
> > Cc: linux-wireless@...r.kernel.org; linux-kernel@...r.kernel.org;
> > briannorris@...omium.org; kvalo@...nel.org; francesco@...cini.it; Pete
> > Hsieh <tsung-hsien.hsieh@....com>; Francesco Dolcini
> > <francesco.dolcini@...adex.com>
> > Subject: [EXT] Re: [PATCH v10 2/2] wifi: mwifiex: add host mlme for AP mode
> > 
> > Caution: This is an external email. Please take care when clicking links or
> > opening attachments. When in doubt, report the message using the 'Report
> > this email' button
> > 
> > 
> > Hi David,
> > 
> > On Thu, Apr 18, 2024 at 02:06:26PM +0800, David Lin wrote:
> > > Add host based MLME to enable WPA3 functionalities in AP mode.
> > > This feature required a firmware with the corresponding V2 Key API
> > > support. The feature (WPA3) is currently enabled and verified only on
> > > IW416. Also, verified no regression with change when host MLME is
> > > disabled.
> > >
> > > Signed-off-by: David Lin <yu-hao.lin@....com>
> > > Reviewed-by: Francesco Dolcini <francesco.dolcini@...adex.com>
> > > ---
> > >
> > 
> > > diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > > b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > > index 491e36611909..073c665183b3 100644
> > > --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > > +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > > @@ -72,6 +72,10 @@ int mwifiex_set_secure_params(struct
> > mwifiex_private *priv,
> > >                               bss_config->key_mgmt =
> > KEY_MGMT_PSK;
> > >                       }
> > >                       break;
> > > +             case WLAN_AKM_SUITE_SAE:
> > > +                     bss_config->protocol = PROTOCOL_WPA2;
> > > +                     bss_config->key_mgmt = KEY_MGMT_SAE;
> > > +                     break;
> > 
> > Shouldn't this be |= PROTOCOL_WPA2 and |= KEY_MGMT_SAE?
> > Clearing the other flags when SAE is enabled looks wrong to me.
> > 
> > Sascha
> > 
> 
> These fields are used for the configuration of FW, this is the correct setting.

This is done in a loop iterating over the different AKM suites, with your
patch this looks like this:

	for (i = 0; i < params->crypto.n_akm_suites; i++) {
		switch (params->crypto.akm_suites[i]) {
		case WLAN_AKM_SUITE_8021X:
			if (params->crypto.wpa_versions &
			    NL80211_WPA_VERSION_1) {
				bss_config->protocol = PROTOCOL_WPA;
				bss_config->key_mgmt = KEY_MGMT_EAP;
			}
			if (params->crypto.wpa_versions &
			    NL80211_WPA_VERSION_2) {
				bss_config->protocol |= PROTOCOL_WPA2;
				bss_config->key_mgmt = KEY_MGMT_EAP;
			}
			break;
		case WLAN_AKM_SUITE_PSK:
			if (params->crypto.wpa_versions &
			    NL80211_WPA_VERSION_1) {
				bss_config->protocol = PROTOCOL_WPA;
				bss_config->key_mgmt = KEY_MGMT_PSK;
			}
			if (params->crypto.wpa_versions &
			    NL80211_WPA_VERSION_2) {
				bss_config->protocol |= PROTOCOL_WPA2;
				bss_config->key_mgmt = KEY_MGMT_PSK;
			}
			break;
		case WLAN_AKM_SUITE_SAE:
			bss_config->protocol = PROTOCOL_WPA2;
			bss_config->key_mgmt = KEY_MGMT_SAE;
			break;

		default:
			break;
		}
	}

It looks wrong to overwrite bss_config->protocol and
bss_config->key_mgmt in each iteration of this loop. If that would be
correct, you wouldn't need a loop at all, but could instead configure
based on the last AKM suite entry.

In my understanding the bits in bss_config->key_mgmt should be ored
together depending on the possible AKM suites which is also what the
downstream driver does.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |