Skip to contentSkip to conversation

station: check return of handshake_state_set_pmksa

PATCH Superseded James Prestwood 1 participant 4 messages Mar 9

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 station: check return of handshake_state_set_pmksa

If this fails num_pmkids and pmkids would get set, but to an uninitialized buffer. This would then fail to build the handshake object later when copying the PMKID.

---
 src/station.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
src/station.c +7 -3
index 50997f5f..6c9e8d13 100644
@@ -1378,9 +1378,13 @@ build_ie:
 					bss->ssid, bss->ssid_len,
 					info.akm_suites);
 		if (pmksa) {
-			handshake_state_set_pmksa(hs, pmksa);
-			info.num_pmkids = 1;
-			info.pmkids = hs->pmksa->pmkid;
+			if (!handshake_state_set_pmksa(hs, pmksa)) {
+				l_warn("failed to set PMKSA to handshake");
+				pmksa_cache_free(pmksa);
+			} else {
+				info.num_pmkids = 1;
+				info.pmkids = hs->pmksa->pmkid;
+			}
 		}
 	}
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 2/4 auto-t: refactor testSAE-roam into connect/roam functions

This makes adding roaming tests easier if they don't strictly conform to the existing test structure. By adding connect/roam helpers future tests will have a bit more control on whats being tested.

---
 autotests/testSAE-roam/connection_test.py | 62 +++++++++--------------
 1 file changed, 25 insertions(+), 37 deletions(-)
autotests/testSAE-roam/connection_test.py +25 -37
index 718bfd77..c813f00f 100644
@@ -13,73 +13,61 @@ import testutil
 from config import ctx
 
 class Test(unittest.TestCase):
-    def validate_connection(self, wd, ft=True, check_used_pmksa=False):
-        device = wd.list_devices(1)[0]
-
+    def connect(self, wd, device, hapd):
         # This won't guarantee all BSS's are found, but at least ensures that
         # at least one will be.
         device.get_ordered_network('TestFT', full_scan=True)
 
-        self.assertFalse(self.bss_hostapd[0].list_sta())
-        self.assertFalse(self.bss_hostapd[1].list_sta())
+        self.assertFalse(hapd.list_sta())
 
-        device.connect_bssid(self.bss_hostapd[0].bssid)
+        device.connect_bssid(hapd.bssid)
 
         condition = 'obj.state == DeviceState.connected'
         wd.wait_for_object_condition(device, condition)
 
-        self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % device.address)
+        hapd.wait_for_event('AP-STA-CONNECTED %s' % device.address)
 
         self.assertFalse(self.bss_hostapd[1].list_sta())
 
         testutil.test_iface_operstate(device.name)
-        testutil.test_ifaces_connected(self.bss_hostapd[0].ifname, device.name)
-        self.assertRaises(Exception, testutil.test_ifaces_connected,
-                          (self.bss_hostapd[1].ifname, device.name, True, True))
+        testutil.test_ifaces_connected(hapd.ifname, device.name)
 
-        # If PMKSA was used, hostapd should not include the sae_group key in
-        # its status for the station.
-        sta_status = self.bss_hostapd[0].sta_status(device.address)
-        if check_used_pmksa:
-            self.assertNotIn("sae_group", sta_status.keys())
-        else:
-            self.assertIn("sae_group", sta_status.keys())
+    def roam(self, wd, device, hapd_from, hapd_to):
+        device.roam(hapd_to.bssid)
 
-        device.roam(self.bss_hostapd[1].bssid)
-
-        # Check that iwd is on BSS 1 once out of roaming state and doesn't
+        # Check that iwd is on hapd_to once out of roaming state and doesn't
         # go through 'disconnected', 'autoconnect', 'connecting' in between
         from_condition = 'obj.state == DeviceState.roaming'
         to_condition = 'obj.state == DeviceState.connected'
         wd.wait_for_object_change(device, from_condition, to_condition)
 
-        self.bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % device.address)
+        hapd_to.wait_for_event('AP-STA-CONNECTED %s' % device.address)
 
         testutil.test_iface_operstate(device.name)
-        testutil.test_ifaces_connected(self.bss_hostapd[1].ifname, device.name)
+        testutil.test_ifaces_connected(hapd_to.ifname, device.name)
         self.assertRaises(Exception, testutil.test_ifaces_connected,
-                          (self.bss_hostapd[0].ifname, device.name, True, True))
+                          (hapd_from.ifname, device.name, True, True))
 
-        if not ft:
-                return
 
-        device.roam(self.bss_hostapd[2].bssid)
+    def validate_connection(self, wd, ft=True, check_used_pmksa=False):
+        device = wd.list_devices(1)[0]
 
-        condition = 'obj.state == DeviceState.roaming'
-        wd.wait_for_object_condition(device, condition)
+        self.connect(wd, device, self.bss_hostapd[0])
 
-        condition = 'obj.state != DeviceState.roaming'
-        wd.wait_for_object_condition(device, condition)
+        # If PMKSA was used, hostapd should not include the sae_group key in
+        # its status for the station.
+        sta_status = self.bss_hostapd[0].sta_status(device.address)
+        if check_used_pmksa:
+            self.assertNotIn("sae_group", sta_status.keys())
+        else:
+            self.assertIn("sae_group", sta_status.keys())
 
-        condition = 'obj.state == DeviceState.connected'
-        wd.wait_for_object_condition(device, condition)
+        self.roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[1])
 
-        self.bss_hostapd[2].wait_for_event('AP-STA-CONNECTED %s' % device.address)
+        if not ft:
+            return
 
-        testutil.test_iface_operstate(device.name)
-        testutil.test_ifaces_connected(self.bss_hostapd[2].ifname, device.name)
-        self.assertRaises(Exception, testutil.test_ifaces_connected,
-                            (self.bss_hostapd[1].ifname, device.name, True, True))
+        self.roam(wd, device, self.bss_hostapd[1], self.bss_hostapd[2])
 
     def test_ft_roam_success(self):
         wd = IWD(True)
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 3/4 auto-t: Add test to roam back to BSS with existing PMKSA

In reply to James Prestwood

This test exposes a bug where if a PMKSA already exists for a BSS that we are roaming to IWD crashes due to a missing check in station.c

---
 autotests/testSAE-roam/connection_test.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
autotests/testSAE-roam/connection_test.py +20 -0
index c813f00f..243178a4 100644
@@ -109,6 +109,26 @@ class Test(unittest.TestCase):
 
         self.validate_connection(wd, True, check_used_pmksa=True)
 
+    def test_ft_roam_with_pmksa(self):
+        wd = IWD(True)
+
+        self.bss_hostapd[0].set_value('wpa_key_mgmt', 'FT-SAE SAE')
+        self.bss_hostapd[0].reload()
+        self.bss_hostapd[0].wait_for_event("AP-ENABLED")
+        self.bss_hostapd[1].set_value('wpa_key_mgmt', 'FT-SAE SAE')
+        self.bss_hostapd[1].reload()
+        self.bss_hostapd[1].wait_for_event("AP-ENABLED")
+        self.bss_hostapd[2].set_value('wpa_key_mgmt', 'FT-PSK')
+        self.bss_hostapd[2].reload()
+        self.bss_hostapd[2].wait_for_event("AP-ENABLED")
+
+        device = wd.list_devices(1)[0]
+
+        self.connect(wd, device, self.bss_hostapd[0])
+
+        self.roam(wd, device, self.bss_hostapd[0], self.bss_hostapd[1])
+        self.roam(wd, device, self.bss_hostapd[1], self.bss_hostapd[0])
+
     def test_reassociate_roam_success(self):
         wd = IWD(True)
 
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 4/4 handshake: check expiration propery in set_pmksa()

In reply to James Prestwood

The existing check was only looking at s->expiration and if it was zero or non-zero. If a PMKSA exists for a BSS the expiration will be non-zero, but that shouldn't preclude us from setting that into the handshake.

Instead check if the PMKSA is actually expired, and only then return false.

---
 src/handshake.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
src/handshake.c +3 -2
index ef1a8220..5e864af3 100644
@@ -1227,8 +1227,9 @@ done:
 bool handshake_state_set_pmksa(struct handshake_state *s,
 					struct pmksa *pmksa)
 {
-	/* checks for both expiration || pmksa being set */
-	if (s->expiration)
+	uint64_t now = l_time_now();
+
+	if (s->expiration && l_time_after(now, s->expiration))
 		return false;
 
 	s->pmksa = pmksa;
Signature · 1 line
2.34.1