mbox series

[v4,0/4] wifi: libertas: IE handling fixes

Message ID 20230123053132.30710-1-doug@schmorgal.com (mailing list archive)
Headers show
Series wifi: libertas: IE handling fixes | expand

Message

Doug Brown Jan. 23, 2023, 5:31 a.m. UTC
This series implements two fixes for the libertas driver that restore
compatibility with modern wpa_supplicant versions, and adds (or at least
improves) support for WPS in the process.

1) Better handling of the RSN/WPA IE in association requests:
   The previous logic was always just grabbing the first one, and didn't
   handle multiple IEs properly, which wpa_supplicant adds nowadays.

2) Support for IEs in scan requests:
   Modern wpa_supplicant always adds an "extended capabilities" IE,
   which violates max_scan_ie_len in this driver. Go ahead and allow
   scan IEs, and handle WPS based on the info that Dan provided.

These changes have been tested on a Marvell PXA168-based device with a
Marvell 88W8686 Wi-Fi chipset. I've confirmed that with these changes
applied, modern wpa_supplicant versions connect properly and WPS also
works correctly (tested with "wpa_cli -i wlan0 wps_pbc any").

Changes since V3:
- Do more extensive code style fixes suggested by Ping-Ke Shih

Changes since V2:
- Add missing cpu_to_le16 as suggested by Simon Horman

Changes since V1 (which was a single patch linked here [1]):

- Switch to cfg80211_find_*_elem when looking for specific IEs,
  resulting in cleaner/safer code.
- Use mrvl_ie_data struct for cleaner manipulation of TLV buffer, and
  fix capitalization of the "data" member to avoid checkpatch warnings.
- Implement idea suggested by Dan to change max_scan_ie_len to be
  nonzero and enable WPS support in probe requests while we're at it.
- Remove "Fixes:" tag; I'm not sure if it's still appropriate or not
  with it depending on the capitalization fix.
- Clarify comments.

[1] https://lore.kernel.org/all/20230102234714.169831-1-doug@schmorgal.com/

Doug Brown (4):
  wifi: libertas: fix code style in Marvell structs
  wifi: libertas: only add RSN/WPA IE in lbs_add_wpa_tlv
  wifi: libertas: add new TLV type for WPS enrollee IE
  wifi: libertas: add support for WPS enrollee IE in probe requests

 drivers/net/wireless/marvell/libertas/cfg.c   | 76 +++++++++++++++----
 drivers/net/wireless/marvell/libertas/types.h | 21 ++---
 2 files changed, 74 insertions(+), 23 deletions(-)

Comments

Simon Horman Jan. 23, 2023, 8:06 a.m. UTC | #1
On Sun, Jan 22, 2023 at 09:31:28PM -0800, Doug Brown wrote:
> This series implements two fixes for the libertas driver that restore
> compatibility with modern wpa_supplicant versions, and adds (or at least
> improves) support for WPS in the process.
> 
> 1) Better handling of the RSN/WPA IE in association requests:
>    The previous logic was always just grabbing the first one, and didn't
>    handle multiple IEs properly, which wpa_supplicant adds nowadays.
> 
> 2) Support for IEs in scan requests:
>    Modern wpa_supplicant always adds an "extended capabilities" IE,
>    which violates max_scan_ie_len in this driver. Go ahead and allow
>    scan IEs, and handle WPS based on the info that Dan provided.
> 
> These changes have been tested on a Marvell PXA168-based device with a
> Marvell 88W8686 Wi-Fi chipset. I've confirmed that with these changes
> applied, modern wpa_supplicant versions connect properly and WPS also
> works correctly (tested with "wpa_cli -i wlan0 wps_pbc any").

Thanks,

this looks good to me. So, FWIIW,

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Dan Williams Jan. 24, 2023, 6:24 p.m. UTC | #2
On Sun, 2023-01-22 at 21:31 -0800, Doug Brown wrote:
> This series implements two fixes for the libertas driver that restore
> compatibility with modern wpa_supplicant versions, and adds (or at
> least
> improves) support for WPS in the process.
> 
> 1) Better handling of the RSN/WPA IE in association requests:
>    The previous logic was always just grabbing the first one, and
> didn't
>    handle multiple IEs properly, which wpa_supplicant adds nowadays.
> 
> 2) Support for IEs in scan requests:
>    Modern wpa_supplicant always adds an "extended capabilities" IE,
>    which violates max_scan_ie_len in this driver. Go ahead and allow
>    scan IEs, and handle WPS based on the info that Dan provided.
> 
> These changes have been tested on a Marvell PXA168-based device with
> a
> Marvell 88W8686 Wi-Fi chipset. I've confirmed that with these changes
> applied, modern wpa_supplicant versions connect properly and WPS also
> works correctly (tested with "wpa_cli -i wlan0 wps_pbc any").

Tested with a usb8388 (fw 9.34.3p23), x86, wpa_supplicant 2.10.
Scanning and connecting to a WPA2 AP works. Doesn't panic when I pull
the dongle out. Ship it!

Reviewed-by: Dan Williams <dcbw@redhat.com>
Tested-by: Dan Williams <dcbw@redhat.com>

Dan

> 
> Changes since V3:
> - Do more extensive code style fixes suggested by Ping-Ke Shih
> 
> Changes since V2:
> - Add missing cpu_to_le16 as suggested by Simon Horman
> 
> Changes since V1 (which was a single patch linked here [1]):
> 
> - Switch to cfg80211_find_*_elem when looking for specific IEs,
>   resulting in cleaner/safer code.
> - Use mrvl_ie_data struct for cleaner manipulation of TLV buffer, and
>   fix capitalization of the "data" member to avoid checkpatch
> warnings.
> - Implement idea suggested by Dan to change max_scan_ie_len to be
>   nonzero and enable WPS support in probe requests while we're at it.
> - Remove "Fixes:" tag; I'm not sure if it's still appropriate or not
>   with it depending on the capitalization fix.
> - Clarify comments.
> 
> [1]
> https://lore.kernel.org/all/20230102234714.169831-1-doug@schmorgal.com/
> 
> Doug Brown (4):
>   wifi: libertas: fix code style in Marvell structs
>   wifi: libertas: only add RSN/WPA IE in lbs_add_wpa_tlv
>   wifi: libertas: add new TLV type for WPS enrollee IE
>   wifi: libertas: add support for WPS enrollee IE in probe requests
> 
>  drivers/net/wireless/marvell/libertas/cfg.c   | 76 +++++++++++++++--
> --
>  drivers/net/wireless/marvell/libertas/types.h | 21 ++---
>  2 files changed, 74 insertions(+), 23 deletions(-)
>