adapter: Fix the reusing gerror without re-initialization

When the GError variable is freeed with g_error_free(), it is not set to
NULL and reusing the same variable again can cause the seg_fault because
it is still pointing the old memory address which is freed.

This patch relaces the g_error_free() to g_clear_error() which frees the
variable and set it to NULL if the variable is used in the function
again.

Fixes: 2287c517ca1bd ("adapter: Fix unchecked return value")
Fixes: https://github.com/bluez/bluez/issues/276
Change-Id: Icdf8d253fa436da4b315985b8b66ee824a1d36e1
Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/src/adapter.c b/src/adapter.c
index b12eccda3a71a32777eb10993c08192a838b9034..830ba76b97d047c6b8aa26727769b5204240d656 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -9599,7 +9599,7 @@ static void load_devices(struct btd_adapter *adapter)
                if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                        error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-                       g_error_free(gerr);
+                       g_clear_error(&gerr);
                }
 
                key_info = get_key_info(key_file, entry->d_name);
@@ -10737,7 +10737,7 @@ static void convert_names_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
        g_key_file_set_string(key_file, "General", "Name", value);
 
@@ -10970,7 +10970,7 @@ static void convert_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        set_device_type(key_file, type);
@@ -11081,7 +11081,7 @@ static void store_sdp_record(char *local, char *peer, int handle, char *value)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        sprintf(handle_str, "0x%8.8X", handle);
@@ -11165,7 +11165,7 @@ static void convert_sdp_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        store_attribute_uuid(key_file, start, end, prim_uuid, uuid);
@@ -11225,7 +11225,7 @@ static void convert_primaries_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        for (service = services; *service; service++) {
@@ -11250,7 +11250,7 @@ static void convert_primaries_entry(char *key, char *value, void *user_data)
        if (!g_file_set_contents(filename, data, length, &gerr)) {
                error("Unable set contents for %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        if (device_type < 0)
@@ -11265,7 +11265,7 @@ static void convert_primaries_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
        set_device_type(key_file, device_type);
 
@@ -11321,7 +11321,7 @@ static void convert_ccc_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        sprintf(group, "%hu", handle);
@@ -11377,7 +11377,7 @@ static void convert_gatt_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        sprintf(group, "%hu", handle);
@@ -11432,7 +11432,7 @@ static void convert_proximity_entry(char *key, char *value, void *user_data)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        g_key_file_set_string(key_file, alert, "Level", value);
@@ -11691,7 +11691,7 @@ static void load_config(struct btd_adapter *adapter)
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        /* Get alias */
@@ -14347,7 +14347,7 @@ static void store_ltk_group(struct btd_adapter *adapter, const bdaddr_t *peer,
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        for (i = 0; i < 16; i++)
@@ -14523,7 +14523,7 @@ static void store_csrk(struct btd_adapter *adapter, const bdaddr_t *peer,
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        for (i = 0; i < 16; i++)
@@ -14611,7 +14611,7 @@ static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer,
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        for (i = 0; i < 16; i++)
@@ -14725,7 +14725,7 @@ static void store_conn_param(struct btd_adapter *adapter, const bdaddr_t *peer,
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        g_key_file_set_integer(key_file, "ConnectionParameters",
@@ -15561,7 +15561,7 @@ static void remove_keys(struct btd_adapter *adapter,
        if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
                error("Unable to load key file from %s: (%s)", filename,
                                                                gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
 
        if (type == BDADDR_BREDR) {
@@ -15663,7 +15663,7 @@ static bool get_static_addr(struct btd_adapter *adapter)
                                                                &gerr)) {
                error("Unable to load key file from %s: (%s)",
                                        STORAGEDIR "/addresses", gerr->message);
-               g_error_free(gerr);
+               g_clear_error(&gerr);
        }
        addrs = g_key_file_get_string_list(file, "Static", mfg, &len, NULL);
        if (addrs) {