Fixes for various memory leaks and other issues

scripts/boilerplate_generator.py

@@ -219,8 +219,10 @@ def get_loading_func(fn_infos, module_name):
         # clear any previous error and load the function
         ret += '    dlerror();\n'
         ret += '    * (void**) (&_{0.name}) = dlsym(handle, "{0.name}");\n'.format(info)
-        ret += '    if ((error = dlerror()) != NULL)\n'
-        ret += '        bd_utils_log_format (BD_UTILS_LOG_WARNING, "failed to load {0.name}: %s", error);\n\n'.format(info)
+        ret += '    if ((error = dlerror()) != NULL) {\n'
+        ret += '        bd_utils_log_format (BD_UTILS_LOG_WARNING, "failed to load {0.name}: %s", error);\n'.format(info)
+        ret += '        _{0.name} = {0.name}_stub;\n'.format(info)
+        ret += '    }\n\n'
 
     ret += '    return handle;\n'
     ret += '}\n\n'

src/lib/blockdev.c.in

@@ -142,8 +142,10 @@ static gboolean process_config_file (const gchar *config_file, GSList **plugins_
     gsize n_sonames = 0;
 
     config = g_key_file_new ();
-    if (!g_key_file_load_from_file (config, config_file, G_KEY_FILE_NONE, error))
+    if (!g_key_file_load_from_file (config, config_file, G_KEY_FILE_NONE, error)) {
+        g_key_file_free (config);
         return FALSE;
+    }
 
     /* get sonames for each plugin (if specified) */
     for (i=0; (i < BD_PLUGIN_UNDEF); i++) {
@@ -330,15 +332,19 @@ static gboolean load_plugins (BDPluginSpec **require_plugins, gboolean reload, g
         unload_plugins ();
         /* clean all so names and populate back those that are requested or the
            defaults */
-        for (i=0; i < BD_PLUGIN_UNDEF; i++)
+        for (i=0; i < BD_PLUGIN_UNDEF; i++) {
+            g_free ((gchar *) plugins[i].spec.so_name);
             plugins[i].spec.so_name = NULL;
+        }
     }
 
     if (require_plugins) {
         /* set requested sonames */
         for (i=0; *(require_plugins + i); i++) {
             plugin_name = require_plugins[i]->name;
-            required_plugins_mask |= (1 << plugin_name);
+            if (plugin_name >= BD_PLUGIN_UNDEF)
+                continue;
+            required_plugins_mask |= ((guint64) 1 << plugin_name);
             if (require_plugins[i]->so_name) {
                 g_slist_free_full (plugins_sonames[plugin_name], (GDestroyNotify) g_free);
                 plugins_sonames[plugin_name] = NULL;
@@ -348,7 +354,7 @@ static gboolean load_plugins (BDPluginSpec **require_plugins, gboolean reload, g
 
         /* now remove the defaults for plugins that are not required */
         for (i=0; (i < BD_PLUGIN_UNDEF); i++)
-            if (!(required_plugins_mask & (1 << i))) {
+            if (!(required_plugins_mask & ((guint64) 1 << i))) {
                 /* plugin not required */
                 g_slist_free_full (plugins_sonames[i], (GDestroyNotify) g_free);
                 plugins_sonames[i] = NULL;
@@ -361,7 +367,7 @@ static gboolean load_plugins (BDPluginSpec **require_plugins, gboolean reload, g
     for (i=0; (i < BD_PLUGIN_UNDEF); i++) {
         /* if this plugin was required or all plugins were required, check if it
            was successfully loaded or not */
-        if (!require_plugins || (required_plugins_mask & (1 << i))) {
+        if (!require_plugins || (required_plugins_mask & ((guint64) 1 << i))) {
 #if !defined(__s390__) && !defined(__s390x__)
             if (!require_plugins && (i == BD_PLUGIN_S390))
                 /* do not check the s390 plugin on different archs unless
@@ -496,7 +502,7 @@ gboolean bd_ensure_init (BDPluginSpec **require_plugins, BDUtilsLogFunc log_func
                 missing = !bd_is_plugin_available((*check_plugin)->name);
         else
             /* all plugins requested */
-            for (plugin=BD_PLUGIN_LVM; plugin != BD_PLUGIN_UNDEF; plugin++)
+            for (plugin=BD_PLUGIN_LVM; !missing && plugin != BD_PLUGIN_UNDEF; plugin++)
                 missing = !bd_is_plugin_available(plugin);
 
         if (!missing) {
@@ -757,6 +763,9 @@ gboolean bd_is_plugin_available (BDPlugin plugin) {
  * %NULL if none is loaded
  */
 gchar* bd_get_plugin_soname (BDPlugin plugin) {
+    if (plugin >= BD_PLUGIN_UNDEF)
+        return NULL;
+
     if (plugins[plugin].handle)
         return g_strdup (plugins[plugin].spec.so_name);
 
@@ -770,5 +779,8 @@ gchar* bd_get_plugin_soname (BDPlugin plugin) {
  * Returns: (transfer none): name of the plugin
  */
 gchar* bd_get_plugin_name (BDPlugin plugin) {
+    if (plugin >= BD_PLUGIN_UNDEF)
+        return NULL;
+
     return plugin_names[plugin];
 }

src/lib/plugin_apis/crypto.api

@@ -1058,7 +1058,7 @@ gboolean bd_crypto_luks_suspend (const gchar *luks_device, GError **error);
 /**
  * bd_crypto_luks_resume:
  * @luks_device: LUKS device to resume
- * @context: (nullable): key slot context (passphrase/keyfile/token...) for @luks_device
+ * @context: key slot context (passphrase/keyfile/token...) for @luks_device
  * @error: (out) (optional): place to store error (if any)
  *
  * Supported @context types for this function: passphrase, key file

src/plugins/crypto.c

@@ -360,6 +360,7 @@ gboolean bd_crypto_init (void) {
  *
  */
 void bd_crypto_close (void) {
+    freelocale (c_locale);
     c_locale = (locale_t) 0;
     crypt_set_log_callback (NULL, NULL, NULL);
     crypt_set_debug_level (CRYPT_DEBUG_NONE);
@@ -770,14 +771,17 @@ void bd_crypto_keyslot_context_free (BDCryptoKeyslotContext *context) {
     if (context == NULL)
         return;
 
-    if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_PASSPHRASE)
+    if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_PASSPHRASE) {
+        explicit_bzero (context->u.passphrase.pass_data, context->u.passphrase.data_len);
         g_free (context->u.passphrase.pass_data);
-    else if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE)
+    } else if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE)
         g_free (context->u.keyfile.keyfile);
     else if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYRING)
         g_free (context->u.keyring.key_desc);
-    else if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_VOLUME_KEY)
+    else if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_VOLUME_KEY) {
+        explicit_bzero (context->u.volume_key.volume_key, context->u.volume_key.volume_key_size);
         g_free (context->u.volume_key.volume_key);
+    }
 
     g_free (context);
 }
@@ -1543,6 +1547,8 @@ gboolean bd_crypto_luks_add_key (const gchar *device, BDCryptoKeyslotContext *co
     } else {
         g_set_error (&l_error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_INVALID_CONTEXT,
                      "Only 'passphrase' and 'key file' context types are valid for LUKS add key.");
+        if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE)
+            crypt_safe_free (key_buf);
         bd_utils_report_finished (progress_id, l_error->message);
         g_propagate_error (error, l_error);
         crypt_free (cd);
@@ -1642,6 +1648,7 @@ gboolean bd_crypto_luks_remove_key (const gchar *device, BDCryptoKeyslotContext
     if (ret < 0) {
         g_set_error (&l_error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_KEY_SLOT,
                      "Failed to determine key slot: %s", strerror_l (-ret, c_locale));
+        crypt_free (cd);
         bd_utils_report_finished (progress_id, l_error->message);
         g_propagate_error (error, l_error);
         return FALSE;
@@ -1753,6 +1760,8 @@ gboolean bd_crypto_luks_change_key (const gchar *device, BDCryptoKeyslotContext
     } else {
         g_set_error (&l_error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_INVALID_CONTEXT,
                      "Only 'passphrase' and 'key file' context types are valid for LUKS change key.");
+        if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE)
+            crypt_safe_free (key_buf);
         bd_utils_report_finished (progress_id, l_error->message);
         g_propagate_error (error, l_error);
         crypt_free (cd);
@@ -1951,7 +1960,7 @@ gboolean bd_crypto_luks_suspend (const gchar *luks_device, GError **error) {
 /**
  * bd_crypto_luks_resume:
  * @luks_device: LUKS device to resume
- * @context: (nullable): key slot context (passphrase/keyfile/token...) for @luks_device
+ * @context: key slot context (passphrase/keyfile/token...) for @luks_device
  * @error: (out) (optional): place to store error (if any)
  *
  * Supported @context types for this function: passphrase, key file
@@ -2252,7 +2261,7 @@ gboolean bd_crypto_luks_set_label (const gchar *device, const gchar *label, cons
 
     if (g_strcmp0 (crypt_get_type (cd), CRYPT_LUKS2) != 0) {
         g_set_error (error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_TECH_UNAVAIL,
-                     "Label can be set only on LUKS 2 devices: %s", strerror_l (-ret, c_locale));
+                     "Label can be set only on LUKS 2 devices.");
         crypt_free (cd);
         return FALSE;
     }
@@ -2965,11 +2974,10 @@ gboolean bd_crypto_integrity_format (const gchar *device, const gchar *algorithm
         ret = crypt_deactivate (cd, tmp_name);
         if (ret != 0)
             bd_utils_log_format (BD_UTILS_LOG_ERR, "Failed to deactivate temporary device %s", tmp_name);
-
-    } else
-        bd_utils_report_finished (progress_id, "Completed");
+    }
 
     crypt_free (cd);
+    bd_utils_report_finished (progress_id, "Completed");
 
     return TRUE;
 }
@@ -3909,7 +3917,7 @@ gboolean bd_crypto_opal_is_supported (const gchar *device, GError **error) {
         g_set_error (error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_DEVICE,
                      "Failed to get opal status for the device '%s': %s",
                      device,
-                     strerror_l (-ret, c_locale));
+                     strerror_l (errno, c_locale));
         close (fd);
         return FALSE;
     }
@@ -4146,6 +4154,9 @@ gboolean bd_crypto_opal_reset_device (const gchar *device, BDCryptoKeyslotContex
     }
 
     ret = crypt_wipe_hw_opal (cd, CRYPT_NO_SEGMENT, key_buf, buf_len, 0);
+    if (context->type == BD_CRYPTO_KEYSLOT_CONTEXT_TYPE_KEYFILE)
+        crypt_safe_free (key_buf);
+
     if (ret != 0) {
         g_set_error (&l_error, BD_CRYPTO_ERROR, BD_CRYPTO_ERROR_DEVICE,
                      "Failed to wipe LUKS HW-OPAL device: %s", strerror_l (-ret, c_locale));

src/plugins/dm.c

@@ -126,7 +126,7 @@ gboolean bd_dm_is_tech_avail (BDDMTech tech, guint64 mode G_GNUC_UNUSED, GError
  */
 gboolean bd_dm_create_linear (const gchar *map_name, const gchar *device, guint64 length, const gchar *uuid, GError **error) {
     gboolean success = FALSE;
-    const gchar *argv[9] = {"dmsetup", "create", map_name, "--table", NULL, NULL, NULL, NULL, NULL};
+    const gchar *argv[8] = {"dmsetup", "create", map_name, "--table", NULL, NULL, NULL, NULL};
 
     if (!check_deps (&avail_deps, DEPS_DMSETUP_MASK, deps, DEPS_LAST, &deps_check_lock, error))
         return FALSE;
@@ -137,9 +137,7 @@ gboolean bd_dm_create_linear (const gchar *map_name, const gchar *device, guint6
     if (uuid) {
         argv[5] = "-u";
         argv[6] = uuid;
-        argv[7] = device;
-    } else
-        argv[5] = device;
+    }
 
     success = bd_utils_exec_and_report_error (argv, NULL, error);
     g_free (table);

src/plugins/fs/btrfs.c

@@ -326,7 +326,7 @@ BDFSBtrfsInfo* bd_fs_btrfs_get_info (const gchar *mpoint, GError **error) {
     GRegex *regex = NULL;
     GMatchInfo *match_info = NULL;
     BDFSBtrfsInfo *ret = NULL;
-    g_autofree gchar *item = NULL;
+    gchar *item = NULL;
     guint64 num_devices = 0;
     guint64 min_size = 0;
     gint scanned = 0;
@@ -351,12 +351,14 @@ BDFSBtrfsInfo* bd_fs_btrfs_get_info (const gchar *mpoint, GError **error) {
 
     success = g_regex_match (regex, output, 0, &match_info);
     if (!success) {
+        g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_PARSE,
+                     "Failed to parse btrfs filesystem information");
         g_regex_unref (regex);
         g_match_info_free (match_info);
         return NULL;
     }
 
-    ret = g_new (BDFSBtrfsInfo, 1);
+    ret = g_new0 (BDFSBtrfsInfo, 1);
 
     ret->label = g_match_info_fetch_named (match_info, "label");
     ret->uuid = g_match_info_fetch_named (match_info, "uuid");
@@ -368,14 +370,17 @@ BDFSBtrfsInfo* bd_fs_btrfs_get_info (const gchar *mpoint, GError **error) {
                      "Btrfs filesystem mounted on %s spans multiple devices (%"G_GUINT64_FORMAT")." \
                      "Filesystem plugin is not suitable for multidevice Btrfs volumes, please use " \
                      "Btrfs plugin instead.", mpoint, num_devices);
+        g_free (item);
         g_match_info_free (match_info);
         g_regex_unref (regex);
         bd_fs_btrfs_info_free (ret);
         return NULL;
     }
 
+    g_free (item);
     item = g_match_info_fetch_named (match_info, "size");
     ret->size = g_ascii_strtoull (item, NULL, 0);
+    g_free (item);
 
     g_match_info_free (match_info);
     g_regex_unref (regex);

src/plugins/fs/common.c

@@ -115,7 +115,8 @@ get_uuid_label (const gchar *device, gchar **uuid, gchar **label, GError **error
                         "Failed to get UUID for the device '%s'", device);
             blkid_free_probe (probe);
             synced_close (fd);
-            g_free (label);
+            g_free (*label);
+            *label = NULL;
             return FALSE;
         }
 

src/plugins/fs/mount.c

@@ -764,7 +764,7 @@ gboolean bd_fs_mount (const gchar *device, const gchar *mountpoint, const gchar
                 }
             } else {
                 g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_FAIL,
-                             "Unsupported argument for unmount: '%s'", (*extra_p)->opt);
+                             "Unsupported argument for mount: '%s'", (*extra_p)->opt);
                 return FALSE;
             }
         }
@@ -811,6 +811,7 @@ gchar* bd_fs_get_mountpoint (const gchar *device, GError **error) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_FAIL,
                      "Failed to set cache for mount info table.");
         mnt_free_table (table);
+        mnt_free_cache (cache);
         return NULL;
     }
 
@@ -832,14 +833,12 @@ gchar* bd_fs_get_mountpoint (const gchar *device, GError **error) {
 
     target = mnt_fs_get_target (fs);
     if (!target) {
-        mnt_free_fs (fs);
         mnt_free_table (table);
         mnt_free_cache (cache);
         return NULL;
     }
 
     mountpoint = g_strdup (target);
-    mnt_free_fs (fs);
     mnt_free_table (table);
     mnt_free_cache (cache);
     return mountpoint;
@@ -869,6 +868,7 @@ gboolean bd_fs_is_mountpoint (const gchar *path, GError **error) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_FAIL,
                      "Failed to set cache for mount info table.");
         mnt_free_table (table);
+        mnt_free_cache (cache);
         return FALSE;
     }
 
@@ -890,13 +890,11 @@ gboolean bd_fs_is_mountpoint (const gchar *path, GError **error) {
 
     target = mnt_fs_get_target (fs);
     if (!target) {
-        mnt_free_fs (fs);
         mnt_free_table (table);
         mnt_free_cache (cache);
         return FALSE;
     }
 
-    mnt_free_fs (fs);
     mnt_free_table (table);
     mnt_free_cache (cache);
     return TRUE;

src/plugins/fs/ntfs.c

@@ -372,7 +372,7 @@ BDFSNtfsInfo* bd_fs_ntfs_get_info (const gchar *device, GError **error) {
 
     mountpoint = bd_fs_get_mountpoint (device, &l_error);
     if (mountpoint != NULL) {
-        g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_NOT_MOUNTED,
+        g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_FAIL,
                      "Can't get NTFS file system information for '%s': Device is mounted.", device);
         return NULL;
     } else {
@@ -403,7 +403,7 @@ BDFSNtfsInfo* bd_fs_ntfs_get_info (const gchar *device, GError **error) {
     line_p = lines;
 
     /* find the beginning of the (data) section we are interested in */
-    while (line_p && *line_p && !strstr (*line_p, "Cluster Size"))
+    while (line_p && *line_p && !strstr (*line_p, "Cluster Size:"))
         line_p++;
     if (!line_p || !(*line_p)) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_PARSE, "Failed to parse NTFS file system information");
@@ -417,7 +417,7 @@ BDFSNtfsInfo* bd_fs_ntfs_get_info (const gchar *device, GError **error) {
     val_start++;
     cluster_size = g_ascii_strtoull (val_start, NULL, 0);
 
-    while (line_p && *line_p && !strstr (*line_p, "Volume Size in Clusters"))
+    while (line_p && *line_p && !strstr (*line_p, "Volume Size in Clusters:"))
         line_p++;
     if (!line_p || !(*line_p)) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_PARSE, "Failed to parse NTFS file system information");
@@ -431,7 +431,7 @@ BDFSNtfsInfo* bd_fs_ntfs_get_info (const gchar *device, GError **error) {
     val_start++;
     ret->size = g_ascii_strtoull (val_start, NULL, 0) * cluster_size;
 
-    while (line_p && *line_p && !strstr (*line_p, "Free Clusters"))
+    while (line_p && *line_p && !strstr (*line_p, "Free Clusters:"))
         line_p++;
     if (!line_p || !(*line_p)) {
         g_set_error (error, BD_FS_ERROR, BD_FS_ERROR_PARSE, "Failed to parse NTFS file system information");

src/plugins/loop.c

@@ -480,7 +480,7 @@ gboolean bd_loop_set_autoclear (const gchar *loop, gboolean autoclear, GError **
     if (!g_str_has_prefix (loop, "/dev/"))
         dev_loop = g_strdup_printf ("/dev/%s", loop);
 
-    msg = g_strdup_printf ("Started setting up the autoclear flag on the /dev/%s device",
+    msg = g_strdup_printf ("Started setting up the autoclear flag on the %s device",
                            dev_loop ? dev_loop : loop);
     progress_id = bd_utils_report_started (msg);
     g_free (msg);