Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock concurrent access to mWpaSupplicant #9704

Merged
merged 2 commits into from
Sep 17, 2021
Merged

Lock concurrent access to mWpaSupplicant #9704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6692707
Lock concurrent access to mWpaSupplicant
tewarid Sep 15, 2021
ccbb4de
Use std::lock_guard to manage std::mutex
tewarid Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 58 additions & 3 deletions src/platform/Linux/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
BitFlags<Internal::GenericConnectivityManagerImpl_WiFi<ConnectivityManagerImpl>::ConnectivityFlags>
ConnectivityManagerImpl::mConnectivityFlag;
struct GDBusWpaSupplicant ConnectivityManagerImpl::mWpaSupplicant;
std::mutex ConnectivityManagerImpl::mWpaSupplicantLock;

bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity()
{
Expand Down Expand Up @@ -399,8 +400,11 @@ bool ConnectivityManagerImpl::_IsWiFiStationConnected()
bool ret = false;
const gchar * state = nullptr;

mWpaSupplicantLock.lock();
tewarid marked this conversation as resolved.
Show resolved Hide resolved

if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
{
mWpaSupplicantLock.unlock();
ChipLogProgress(DeviceLayer, "wpa_supplicant: _IsWiFiStationConnected: interface not connected");
return false;
}
Expand All @@ -413,6 +417,8 @@ bool ConnectivityManagerImpl::_IsWiFiStationConnected()
ret = true;
}

mWpaSupplicantLock.unlock();

return ret;
}

Expand All @@ -426,8 +432,11 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned()
bool ret = false;
const gchar * bss = nullptr;

mWpaSupplicantLock.lock();

if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
{
mWpaSupplicantLock.unlock();
ChipLogProgress(DeviceLayer, "wpa_supplicant: _IsWiFiStationProvisioned: interface not connected");
return false;
}
Expand All @@ -438,13 +447,18 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned()
ret = true;
}

mWpaSupplicantLock.unlock();

return ret;
}

void ConnectivityManagerImpl::_ClearWiFiStationProvision()
{
mWpaSupplicantLock.lock();

if (mWpaSupplicant.state != GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED)
{
mWpaSupplicantLock.unlock();
ChipLogProgress(DeviceLayer, "wpa_supplicant: _ClearWiFiStationProvision: interface not connected");
return;
}
Expand All @@ -461,12 +475,20 @@ void ConnectivityManagerImpl::_ClearWiFiStationProvision()
g_error_free(err);
}
}

mWpaSupplicantLock.unlock();
}

bool ConnectivityManagerImpl::_CanStartWiFiScan()
{
return mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED &&
mWpaSupplicantLock.lock();

bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED &&
mWpaSupplicant.scanState == GDBusWpaSupplicant::WIFI_SCANNING_IDLE;

mWpaSupplicantLock.unlock();

return ret;
}

CHIP_ERROR ConnectivityManagerImpl::_SetWiFiAPMode(WiFiAPMode val)
Expand Down Expand Up @@ -559,7 +581,10 @@ CHIP_ERROR ConnectivityManagerImpl::_GetEthOverrunCount(uint64_t & overrunCount)

void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * source_object, GAsyncResult * res, gpointer user_data)
{
GError * err = nullptr;
GError * err = nullptr;

mWpaSupplicantLock.lock();

WpaFiW1Wpa_supplicant1Interface * iface = wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus_finish(res, &err);

if (mWpaSupplicant.iface)
Expand All @@ -584,12 +609,16 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * source_object,

if (err != nullptr)
g_error_free(err);

mWpaSupplicantLock.unlock();
}

void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * source_object, GAsyncResult * res, gpointer user_data)
{
GError * err = nullptr;

mWpaSupplicantLock.lock();

gboolean result =
wpa_fi_w1_wpa_supplicant1_call_get_interface_finish(mWpaSupplicant.proxy, &mWpaSupplicant.interfacePath, res, &err);
if (result)
Expand Down Expand Up @@ -648,13 +677,20 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * source_object, GAsy

if (err != nullptr)
g_error_free(err);

mWpaSupplicantLock.unlock();
}

void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * proxy, const gchar * path, GVariant * properties,
gpointer user_data)
{
mWpaSupplicantLock.lock();

if (mWpaSupplicant.interfacePath)
{
mWpaSupplicantLock.unlock();
return;
}

mWpaSupplicant.interfacePath = const_cast<gchar *>(path);
if (mWpaSupplicant.interfacePath)
Expand All @@ -666,13 +702,20 @@ void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * prox
mWpaSupplicant.interfacePath, nullptr, _OnWpaInterfaceProxyReady,
nullptr);
}

mWpaSupplicantLock.unlock();
}

void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * proxy, const gchar * path, GVariant * properties,
gpointer user_data)
{
mWpaSupplicantLock.lock();

if (mWpaSupplicant.interfacePath == nullptr)
{
mWpaSupplicantLock.unlock();
return;
}

if (g_strcmp0(mWpaSupplicant.interfacePath, path) == 0)
{
Expand All @@ -694,12 +737,16 @@ void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * pr

mWpaSupplicant.scanState = GDBusWpaSupplicant::WIFI_SCANNING_IDLE;
}

mWpaSupplicantLock.unlock();
}

void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * source_object, GAsyncResult * res, gpointer user_data)
{
GError * err = nullptr;

mWpaSupplicantLock.lock();

mWpaSupplicant.proxy = wpa_fi_w1_wpa_supplicant1_proxy_new_for_bus_finish(res, &err);
if (mWpaSupplicant.proxy != nullptr && err == nullptr)
{
Expand All @@ -722,6 +769,8 @@ void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * source_object, GAsyncRe

if (err != nullptr)
g_error_free(err);

mWpaSupplicantLock.unlock();
}

void ConnectivityManagerImpl::StartWiFiManagement()
Expand All @@ -740,7 +789,13 @@ void ConnectivityManagerImpl::StartWiFiManagement()

bool ConnectivityManagerImpl::IsWiFiManagementStarted()
{
return mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED;
mWpaSupplicantLock.lock();

bool ret = mWpaSupplicant.state == GDBusWpaSupplicant::WPA_INTERFACE_CONNECTED;

mWpaSupplicantLock.unlock();

return ret;
}

void ConnectivityManagerImpl::DriveAPState()
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Linux/ConnectivityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ class ConnectivityManagerImpl final : public ConnectivityManager,

static BitFlags<ConnectivityFlags> mConnectivityFlag;
static struct GDBusWpaSupplicant mWpaSupplicant;
static std::mutex mWpaSupplicantLock;

#endif

// ==================== ConnectivityManager Private Methods ====================
Expand Down