From 5530688b92383d72ecdf6be96e968db5e31dd18e Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Sun, 24 Oct 2021 21:48:34 +0200 Subject: [PATCH] MBO: Fix the allowed range of mbo_assoc_disallow values This parameter was added with the commit message indicating the valid reason code values to be 1-5, but with the implementation allowed only 1. There are five defined reason code values for the Association Disallowed attribute, so extend the allowed range to cover all those values. Fixes: fb9a1c3e285d ("hostapd: Add MBO IE to Beacon, Probe Response, Association Response") Signed-off-by: Janusz Dziedzic --- hostapd/ctrl_iface.c | 2 +- tests/hwsim/test_mbo.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index 9c7527d08..a00dc4f02 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -1504,7 +1504,7 @@ static int hostapd_ctrl_iface_set(struct hostapd_data *hapd, char *cmd) return -1; val = atoi(value); - if (val < 0 || val > 1) + if (val < 0 || val > MBO_ASSOC_DISALLOW_REASON_LOW_RSSI) return -1; hapd->mbo_assoc_disallow = val; diff --git a/tests/hwsim/test_mbo.py b/tests/hwsim/test_mbo.py index 36efd6a0e..d4426ac4b 100644 --- a/tests/hwsim/test_mbo.py +++ b/tests/hwsim/test_mbo.py @@ -203,8 +203,8 @@ def test_mbo_assoc_disallow(dev, apdev, params): hapd2 = hostapd.add_ap(apdev[1], {"ssid": "MBO", "mbo": "1"}) logger.debug("Set mbo_assoc_disallow with invalid value") - if "FAIL" not in hapd1.request("SET mbo_assoc_disallow 2"): - raise Exception("Set mbo_assoc_disallow for AP1 succeeded unexpectedly with value 2") + if "FAIL" not in hapd1.request("SET mbo_assoc_disallow 6"): + raise Exception("Set mbo_assoc_disallow for AP1 succeeded unexpectedly with value 6") logger.debug("Disallow associations to AP1 and allow association to AP2") if "OK" not in hapd1.request("SET mbo_assoc_disallow 1"):