commit	0972bb2595973157f0dbeced69241c7cd835b405	[log] [tgz]
author	Arowa Suliman <arowa@chromium.org>	Fri Sep 13 16:45:46 2024
committer	Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>	Fri Sep 13 20:20:46 2024
tree	9f3400158a0e679c48537d1f174306c1c42296dd
parent	09a540582dfebf5c376b9558fef2b672ae41b6f0 [diff]

Revert "CHROMIUM: merge-c6a8db47c from branch/tag: upstream/main into branch: wpa_supplicant-2.10.0"

This reverts commit 56e7f75881424bc991d280b0c6f74549ee42d648.

Reason for revert: This merge includes a CL that increases the connection time by adding a redundant scan, please refer to the bug for more info b:363899693

Original change's description:
> CHROMIUM: merge-c6a8db47c from branch/tag: upstream/main into branch: wpa_supplicant-2.10.0
>
> Changelog:
> -------------------------------------------------------------
> Adil Saeed Musthafa (1):
>       RSNO: Protect wpa_ie_buf3 from reuse explicitly
>
> Aditya Kumar Singh (17):
>       nl80211: Fix scan request and its related events handling with MLO
>       nl80211: Fix simultaneous scanning failure in case of MLO
>       Share usec-to/from-TU conversion macros in a general location
>       hostapd: Add Max Channel Switch Time element support
>       AP MLD: Use the cached per STA profile instead of forming a new one
>       nl80211: Add ifname and link ID debug prints in mlme_event_ch_switch()
>       nl80211: Sanitize link ID in mlme_event_ch_switch() for AP interface
>       tests: Add CSA support on non-first link of AP MLD
>       hostapd: Refactor interface enable/disable into separate helper functions
>       AP MLD: Handle driver events for interface enable/disable
>       nl80211: Make nl80211_remove_link() non-static
>       nl80211: MLO: Process stop AP event on link basis
>       nl80211: Remove unused function argument from is_drv_shared() ops
>       hostapd: Fetch multiple radios information from the driver
>       hostapd: Avoid channel selection across underlying hardware index
>       AP MLD: Fix PN/IPN/BIPN for group rekeying
>       tests: Enable MLD GTK rekey test
>
> Aloka Dixit (1):
>       hostapd: Enable HE when EHT is set for channel switch
>
> Amith A (1):
>       Add support to switch channel when CAC is in progress
>
> Arunpandi Kannan (1):
>       AP MLD: Handle Vendor Specific element inheritance in per STA profile
>
> Avraham Stern (1):
>       MBO: Always accept BTM request with disassociation imminent bit set
>
> Benjamin Berg (15):
>       WNM: Only trigger selection logic for own scans
>       WNM: Store whether disassociation address is an MLD MAC address
>       WNM: Rename wnm_dissoc_addr
>       WNM: Use os_relatime_add_ms() helper
>       WNM: Split candidate list parsing into a separate function
>       WNM: Remove unused age parameter for neighbor comparison
>       WNM: Swap logic in wnm_is_bss_excluded() to allow more checks
>       WNM: Move neighbor report test into wnm_is_bss_excluded()
>       tests: Set the abridged bit in BTM tests
>       WNM: Reject requests with an invalid dialog token
>       WNM: Consolidate the scanning paths for BTM requests
>       WNM: Always parse candidate list
>       tests: Add a WNM tests to check candidate list is used if not required
>       WNM: Scan for BSSID if there are forbidden neighbors
>       build: Add simple compile_commands.json generation
>
> Chenming Huang (1):
>       FILS: Check for potential NULL return
>
> David Bauer (3):
>       OWE: Reduce code duplication in OWE element parsing
>       OWE: Enable roaming between OWE APs
>       bgscan: Add OWE transition mode SSID to network scan
>
> David Ruth (1):
>       dbus: Fix SignalChange property
>
> Davide Caratti (1):
>       dbus: Fix memory leak with Bonjour params for a P2P UPnP service
>
> Diya Sati (1):
>       Add Link ID attribute for external ACS vendor command
>
> Gal Savion (1):
>       Avoid sending DEAUTH or DISASSOC packet when using flag tx=0
>
> Ganesh Kariganuru Mahabalesh (1):
>       nl80211: MLD: Fix is_shared_drv ops logic when num links is one
>
> Hu Wang (1):
>       Enhance select_network() to trigger new scans in some cases
>
> Janusz Dziedzic (5):
>       tests: Add RemoteCtrl class
>       tests: Allow to use remote wpa_cli in WpaSupplicant class
>       tests: Allow to use remote hostapd_cli in Hostapd classes
>       tests: Allow user name to be skipped in ssh connection with remotehost
>       tests: Use remote_cli in remote testing
>
> Jintao Lin (2):
>       P2P: Use specified frequency for group client in P2P_GROUP_ADD command
>       nl80211: NULL pointer check for link before use
>
> Johannes Berg (1):
>       hostapd: Fix BSS parameters change count on link removal
>
> Jouni Malinen (42):
>       Preparations for v2.11 release
>       The main branch is now used for v2.12 development
>       Define WFA vendor specific element types for RSNE/RSNXE overriding
>       Add RSN overriding elements into IE parsing
>       Allow RSNE Override element to override RSNE contents during parsing
>       Allow RSNXE Override element to override RSNXE contents during parsing
>       RSNE/RSNXE overriding for AP
>       Use helper functions to access RSNE/RSNXE from BSS entries
>       Make driver capabilities for AKM suites available within wpa_supplicant
>       RSNE/RSNXE overriding for STA
>       tests: RSNE/RSNXE overriding
>       RSNO: Allow RSNXE to be omitted
>       RSNO: Support over two octets of RSNXOE capabilities
>       Allow RSNE/RSNXE/RSNOE/RSNO2E/RSNXOE to be replace for testing
>       Testing functionality to allow EAPOL-Key Reserved field to be set
>       tests: Long extra KDE in EAPOL-Key msg 3/4
>       wlantest: Remove unused QoS handling from GCMP nonce generation
>       RSNO: Remove override elements from EAPOL-Key msg 3/4
>       RSNO: Remove unused override element generation
>       RSNO: Use the RSN Selection element to indicate which variant was used
>       RSNO: Use SNonce cookie to indicate support for RSN overriding
>       RSNO: Include all RSNE/RSNXE variants in EAPOL-Key message 3/4
>       tests: More detailed error logging for RSN overriding with MLD
>       RSNO: Verify all RSNE/RSNXE variants in multi-link cases
>       WNM: Rename wnm_dissoc_timer
>       tests: Use newer hostapd.add_ap() argument style
>       Sync with wireless-next.git include/uapi/linux/nl80211.h
>       tests: hostapd error path on driver interface initialization failure
>       tests: AP MLD with two links in a bridge
>       tests: Fix duplicate test case name
>       Fix GKeyDoneStations tracking for VLAN
>       tests: Group rekeying with VLANs
>       More detailed documentation for QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES
>       RSNO: Do not enforce SNonce cookie and RSN Selection match if RSNO not used
>       tests: RSN overriding enabled only on the STA
>       tests: RSN overriding and WPA3-Personal Compatibility Mode
>       DPP: Do not restrict SAE password length on Configurator
>       DPP: Do not restrict SAE password length on Enrollee
>       tests: DPP and SAE with short password
>       tests: Fix EHT 320 MHz tests to clear sae_groups
>       Allow IE overriding to use maximum element length
>       tests: RSNXE extensibility
>
> Karthik M (2):
>       hostapd: Refactor Channel Switch Wrapper element generation
>       hostapd: Add Bandwidth Indication subelement support for channel switch
>
> Karthikeyan Kathirvel (1):
>       AP MLD: Add links to bridge FDB for FT roaming
>
> Manish Dharanenthiran (2):
>       Relocate the declaration of the hostapd_find_by_sta() function to top
>       nl80211: Handle nl80211_cqm_event per BSS
>
> Matthew Wang (3):
>       Fix success check for triggering 6 GHz scan
>       Trigger a 6 GHz scan if RNR contains matching short SSID
>       Move wpas_trigger_6ghz_scan() up in the file
>
> Naveen S (1):
>       AP MLD: Handle garbage pointer after MLD interface is deleted
>
> Purushottam Kushwaha (2):
>       Add QCA vendor subcommand to request audio transport switch
>       Add QCA vendor attribute to skip recently scanned channels
>
> Radha Krishna Simha Jiguru (1):
>       nl80211: Add AP_VLAN interface to bridge after interface is up
>
> Rameshkumar Sundaram (2):
>       WNM: Fix potential NULL pointer dereference during assoc response handling
>       AP MLD: Fix ML STA wpa_group update during rekey
>
> Ruth Mekonnen (2):
>       Add non-PSC channels to 6 GHz scan request
>       dbus: Emit ScanInProgress6GHz property
>
> Shiva Sankar Gajula (1):
>       Add link ID attribute to ADD_STA_NODE QCA vendor command for AP MLD
>
> Shivam Rai (2):
>       PASN: Add support to reject PASN auth 1 based on user input
>       PASN: Add a function to configure noauth variable
>
> Sidhanta Sahu (1):
>       AP MLD: Ensure successful addition of link item into list
>
> Sriram R (5):
>       Move mld_link_info structure to hostapd.h header file
>       AP MLD: Generate and keep per STA profiles for each link
>       AP MLD: Ignore elements which are not meant to be included in per STA profile
>       AP MLD: Intersect per STA profile with the reporting BSS
>       AP MLD: Add non-inheritance support for per STA profile reporting
>
> Sunil Ravi (1):
>       Move NULL check for driver private data (drv_priv)
>
> Veerendranath Jakkam (14):
>       FT: Fix FTE MIC calculation with fragmented FTE
>       Add QCA vendor feature flags to indicate RSN override elements support
>       nl80211: Add a capability flag for RSN overriding
>       Fallback to RSNXE when AP is not using valid RSN Overrding
>       RSNO: Use correct MLO capability while fetching RSNE/RSNXE
>       MLD STA: Fix destination address for EAPOL frames
>       SAE: Add group 20 in default groups when AP started with SAE-EXT-KEY
>       RSNO: Fix storing RSNE/RSNXE variants to wpa_sm from association event
>       RSNO: Add debug prints for RSN override elements in EAPOL frames
>       Use QCA_WLAN_VENDOR_FEATURE_RSN_OVERRIDE_STA only for indicating driver support
>       QCA vendor interface for indicating supplicant support for RSN overriding
>       RSNO: Update RSN overriding capability indication to the driver
>       RSNO: Skip validating RSN Override elements with MLO when RSN overriding not used
>       RSNO: Always enable SNonce cookie and RSN Override elements validation
>
> Vinay Gannevaram (2):
>       Add QCA vendor interface to support Unsynchronized Service Discovery
>       SAE: Send external auth status after sending Authentication frame
>
> Yu Zhang(Yuriy) (1):
>       WNM: Extend workaround for broken AP operating class behavior
>
> BUG=b:360187725
> TEST=ran wifi_matfunc on brya and hwsim tests on betty.
>
> Change-Id: I3cfcc47cf2efdab9293c52a048970c5536155219
> Signed-off-by: Arowa Suliman <arowa@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/hostap/+/5809219
> Commit-Queue: Arowa Suliman <arowa@chromium.org>
> Reviewed-by: Matthew Wang <matthewmwang@chromium.org>
> Tested-by: Arowa Suliman <arowa@chromium.org>
> Reviewed-by: Jintao Lin <jintaolin@chromium.org>

BUG=b:360187725

Change-Id: Iddfff6d9bea73128dc18a7f2417160a9bbd81db1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/hostap/+/5860831
Reviewed-by: Jintao Lin <jintaolin@chromium.org>
Tested-by: Arowa Suliman <arowa@chromium.org>
Reviewed-by: Matthew Wang <matthewmwang@chromium.org>
Commit-Queue: Arowa Suliman <arowa@chromium.org>

116 files changed

tree: 9f3400158a0e679c48537d1f174306c1c42296dd

README.md

Contributing to wpa_supplicant in CrOS

This documents how to develop, test, and submit code to wpa_supplicant in ChromeOS.

Build and deploy

This follows the standard ChromeOS development flow:

cros-workon-${BOARD} wpa_supplicant-cros
emerge-${BOARD} wpa_supplicant-cros
cros deploy ${DUT} wpa_supplicant-cros

Note that wpa_supplicant-cros/current and wpa_supplicant-cros/next are identical. This is a vestige of how we used to uprevs, but now that we've converted to automated merges, we no longer regularly use both directories other than for the occasional rollout of a new feature flag. Please develop in wpa_supplicant-cros/current.

To restart wpa_supplicant after deploying:

(DUT) # restart wpasupplicant

Testing

If applicable, implement the appropriate shill hooks (e.g. supplicant_interface_proxy_interface.h) and execute the appropriate shill flow. See go/shill-cheatsheet for shill development tips.
Use the wpa_supplicant command line interface wpa_cli:

sudo -u wpa -g wpa wpa_cli

Use dbus-send:

dbus-send --system --print-reply --dest=fi.w1.wpa_supplicant1 \
	/fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.AddNetwork \
	...

or gdbus:

gdbus call --system --dest fi.w1.wpa_supplicant1 --object-path \
	/fi/w1/wpa_supplicant1/Interfaces/0 --method \
	fi.w1.wpa_supplicant1.Interface.AddNetwork \
	...

Use hostap_hwsim
Run matfunc tests

Uploading to Gerrit

We try to follow kernel conventions detailed here. For trivial changes, feel free to send them upstream without internal review (see below for more details). Otherwise, upload them with a WIP: prefix to indicate that you'd like internal feedback first. After getting a +1 from relevant reviewers, you should send the patch upstream. For time-sensitive changes, we allow landing the change as FROMLIST with an UPSTREAM-TASK tag at the end specifying a bug number to track the task of upstreaming the change. Please also add the CrOSWiFi-PendingUpstreamReview hotlist to the task and add the patch to go/cros_supplicant_patches. For other changes, we prefer landing the change as UPSTREAM or BACKPORT to avoid accruing technical debt.

If you‘ve landed your change as FROMLIST, make sure to monitor the hostap mailing list so you can revise your patch if necessary. After it has been accepted upstream, revert the original FROMLIST patch and land it as UPSTREAM (or BACKPORT) to update the change to its latest version if necessary. There’s no need to do this if there is no diff between the UPSTREAM and FROMLIST patches. An easy way to do this is to run the following command:

diff <(git show ${FROMLIST_HASH}) <(git show ${UPSTREAM_HASH})

Note that there will always be diffs, but you can skip relanding as long as these diffs are part of the patch itself. Remember to close the task that was opened to track upstreaming, and remove the patch from go/cros_supplicant_patches.

Contributing upstream

For convenience, we suggest subscribing to the hostap mailing list so that your patches will be automatically posted to the list without approval. Note that DMARC restrictions may prevent subscribing to the mailing list with your @google.com email. Sending changes upstream is fairly similar to the kernel process. Follow those instructions to set up your git configuration and for best practices with respect to patch titling and formatting. Note that our wpa_supplicant repository already contains an upstream/main branch that you can use to make sure the patch applies cleanly upstream. Once you are ready to send your patch(es), you can send them to j@w1.fi (Jouni Malinen, the maintainer) and hostap@lists.infradead.org (the mailing list).