Skip to content

RDKEMW-6189, RDKEMW-6300: Fix RemoveKnownSSID response and address memory leak in NetworkManager #197

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

Merged
merged 5 commits into from
Jul 24, 2025
Merged

RDKEMW-6189, RDKEMW-6300: Fix RemoveKnownSSID response and address memory leak in NetworkManager #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0667ec0
RDKEMW-6300 fix for memory leak in NetworkManager
cmuhammedrafi Jul 24, 2025
15945cf
updated the log line
cmuhammedrafi Jul 24, 2025
8dd4200
updated review comments
cmuhammedrafi Jul 24, 2025
1c5b185
error logic updated
cmuhammedrafi Jul 24, 2025
5958731
updated the error line
cmuhammedrafi Jul 24, 2025
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
10 changes: 7 additions & 3 deletions plugin/NetworkManagerSecretAgent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,14 @@ namespace WPEFramework
&error);

if (!agentRegID) {
NMLOG_ERROR("Failed to register object: %s", error->message);
g_error_free(error);
NMLOG_ERROR("Failed to register object:");
if (error != NULL)
{
NMLOG_ERROR("Error : %s", error->message);
g_error_free(error);
}
g_dbus_node_info_unref(node_info);
return ;
return;
}

NMLOG_INFO("Object registered with ID: %u", agentRegID);
Expand Down
6 changes: 4 additions & 2 deletions plugin/gnome/NetworkManagerGnomeProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ namespace WPEFramework
// initialize the NMClient object
client = nm_client_new(NULL, &error);
if (client == NULL) {
NMLOG_FATAL("Error initializing NMClient: %s", error->message);
g_error_free(error);
if (error) {
NMLOG_FATAL("Error initializing NMClient: %s", error->message);
g_error_free(error);
}
return;
}

Expand Down
131 changes: 94 additions & 37 deletions plugin/gnome/NetworkManagerGnomeWIFI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ namespace WPEFramework

m_client = nm_client_new(NULL, &error);
if (!m_client || !m_loop) {
NMLOG_ERROR("Could not connect to NetworkManager: %s.", error->message);
g_error_free(error);
if (error) {
NMLOG_ERROR("Could not connect to NetworkManager: %s.", error->message);
g_error_free(error);
}
return false;
}
return true;
Expand Down Expand Up @@ -337,23 +339,28 @@ namespace WPEFramework

static void disconnectCb(GObject *object, GAsyncResult *result, gpointer user_data)
{
NMDevice *device = NM_DEVICE(object);
GError *error = NULL;
wifiManager *_wifiManager = (static_cast<wifiManager*>(user_data));
NMDevice *device = NM_DEVICE(object);
GError *error = NULL;
wifiManager *_wifiManager = static_cast<wifiManager*>(user_data);

NMLOG_DEBUG("Disconnecting... ");
_wifiManager->m_isSuccess = true;
if (!nm_device_disconnect_finish(device, result, &error)) {
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;

NMLOG_ERROR("Device '%s' (%s) disconnecting failed: %s",
nm_device_get_iface(device),
nm_object_get_path(NM_OBJECT(device)),
error->message);
g_error_free(error);
_wifiManager->quit(device);
_wifiManager->m_isSuccess = false;
if (!nm_device_disconnect_finish(device, result, &error))
{
NMLOG_ERROR("device '%s' disconnect failed !", nm_device_get_iface(device));
if(error != NULL)
{
if(g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
NMLOG_ERROR("something went wrong no matching gerror found !");
}
else
{
NMLOG_ERROR("Device path '%s': %s", nm_object_get_path(NM_OBJECT(device)), error->message);
}
g_error_free(error);
}
_wifiManager->m_isSuccess = false;
}
_wifiManager->quit(device);
}
Expand Down Expand Up @@ -566,8 +573,12 @@ namespace WPEFramework
NULL,
&error))
{
NMLOG_ERROR("ca certificate add failed: %s", error->message);
g_error_free(error);
NMLOG_ERROR("ca certificate add failed");
if(error != NULL)
{
NMLOG_ERROR("Error message %s", error->message);
g_error_free(error);
}
return false;
}

Expand All @@ -577,8 +588,12 @@ namespace WPEFramework
NULL,
&error))
{
NMLOG_ERROR("client certificate add failed: %s", error->message);
g_error_free(error);
NMLOG_ERROR("client certificate add failed");
if(error != NULL)
{
NMLOG_ERROR("Error message %s", error->message);
g_error_free(error);
}
return false;
}

Expand All @@ -589,8 +604,12 @@ namespace WPEFramework
NULL,
&error))
{
NMLOG_ERROR("client private key add failed: %s", error->message);
g_error_free(error);
NMLOG_ERROR("client private key failed");
if(error != NULL)
{
NMLOG_ERROR("Error message %s", error->message);
g_error_free(error);
}
return false;
}

Expand Down Expand Up @@ -713,6 +732,9 @@ namespace WPEFramework
NMLOG_ERROR("'%s' connection not found !", knowConnectionID.c_str());
}

if(knownConnection != NULL)
g_object_unref(knownConnection);

deleteClientConnection();
return m_isSuccess;
}
Expand Down Expand Up @@ -878,8 +900,10 @@ namespace WPEFramework
ret = nm_remote_connection_update2_finish(remote_con, res, &error);

if (!ret) {
NMLOG_ERROR("Error: %s.", error->message);
g_error_free(error);
if(error) {
NMLOG_ERROR("Error: %s.", error->message);
g_error_free(error);
}
_wifiManager->m_isSuccess = false;
NMLOG_ERROR("AddToKnownSSIDs failed");
}
Expand Down Expand Up @@ -995,6 +1019,7 @@ namespace WPEFramework
{
NMConnection *m_connection = NULL;
bool ssidSpecified = false;
bool connectionFound = false;

if(!createClientNewConnection())
return false;
Expand Down Expand Up @@ -1039,13 +1064,27 @@ namespace WPEFramework
nm_remote_connection_delete(NM_REMOTE_CONNECTION(connection), NULL, &error);
if(error) {
NMLOG_ERROR("deleting connection failed %s", error->message);
g_error_free(error);
if(m_connection)
{
g_object_unref(m_connection);
m_connection = NULL;
}
break; // error break the loop and return false
}
else
NMLOG_INFO("delete '%s' connection ...", connId);
connectionFound = true;
}

if(m_connection)
{
g_object_unref(m_connection);
m_connection = NULL;
}
}

if(!m_connection)
if(!connectionFound)
{
if(ssidSpecified)
NMLOG_WARNING("'%s' no such connection profile", ssid.c_str());
Expand All @@ -1054,7 +1093,9 @@ namespace WPEFramework
}

deleteClientConnection();
return true;
// ssid is specified and connection is not found return false
// all other case return true, even if no wificonnection is found
return((ssidSpecified && !connectionFound)? false : true);
}

bool wifiManager::getKnownSSIDs(std::list<string>& ssids)
Expand Down Expand Up @@ -1201,8 +1242,10 @@ namespace WPEFramework
GMainLoop *loop = static_cast<GMainLoop *>(user_data);
nm_client_add_and_activate_connection_finish(NM_CLIENT(client), result, &error);

if (error)
if (error) {
NMLOG_ERROR("Failed to add/activate new connection: %s", error->message);
g_error_free(error);
}
else
NMLOG_INFO("WPS connection added/activated successfully");
g_main_loop_quit(loop);
Expand Down Expand Up @@ -1236,6 +1279,7 @@ namespace WPEFramework
nm_remote_connection_delete (NM_REMOTE_CONNECTION(connection), NULL, &error);
if(error) {
NMLOG_ERROR("deleting connection failed %s", error->message);
g_error_free(error);
return false;
}
}
Expand Down Expand Up @@ -1526,16 +1570,25 @@ namespace WPEFramework
wifiManager *_wifiManager = static_cast<wifiManager *>(user_data);
GError *error = nullptr;

if (!nm_client_dbus_set_property_finish(NM_CLIENT(object), result, &error)) {
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
if (!nm_client_dbus_set_property_finish(NM_CLIENT(object), result, &error))
{
NMLOG_ERROR("Failed to set Managed property");
if (error != nullptr)
{
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
NMLOG_ERROR("something went wrong no matching gerror found !");
}
else
{
NMLOG_ERROR("Failed Error msg: %s", error->message);
}
g_error_free(error);
return;
_wifiManager->m_isSuccess = false;
}

NMLOG_ERROR("Failed to set Managed property: %s", error->message);
g_error_free(error);
_wifiManager->m_isSuccess = false;
} else {
}
else
{
NMLOG_DEBUG("Successfully set Managed property.");
_wifiManager->m_isSuccess = true;
}
Expand Down Expand Up @@ -1664,8 +1717,12 @@ namespace WPEFramework
NMLOG_DEBUG("activate connection completeing...");
// Check if the operation was successful
if (!nm_client_activate_connection_finish(NM_CLIENT(source_object), res, &error)) {
NMLOG_DEBUG("Activating connection failed: %s", error->message);
g_error_free(error);
NMLOG_ERROR("Activating connection failed");
if(error != NULL)
{
NMLOG_ERROR("Activating connection failed: %s", error->message);
g_error_free(error);
}
_wifiManager->m_isSuccess = false;
} else {
NMLOG_DEBUG("Activating connection successful");
Expand Down
6 changes: 6 additions & 0 deletions plugin/gnome/gdbus/NetworkManagerGdbusEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ namespace WPEFramework
GVariant *ifaceVariant = g_dbus_proxy_get_cached_property(deviceProxy, "Interface");
if (ifaceVariant == NULL) {
NMLOG_WARNING("Interface property get error");
g_object_unref(deviceProxy);
return ifname;
}

Expand Down Expand Up @@ -750,7 +751,12 @@ namespace WPEFramework

g_variant_get(result, "(ao)", &iter);
if(iter == NULL)
{
NMLOG_ERROR("GetAllAccessPoints GVariantIter returned NULL");
g_variant_unref(result);
g_object_unref(wProxy);
return;
}
while (g_variant_iter_loop(iter, "o", &apPath)) {
Exchange::INetworkManager::WiFiSSIDInfo wifiInfo;
// NMLOG_DEBUG("Access Point Path: %s", apPath);
Expand Down