[PATCH v2 22/27] virStorageBackendRBDOpenRADOSConn: Use virSecureEraseString instead of VIR_AUTODISPOSE_STR

[Peter Krempa]

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/storage/storage_backend_rbd.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 1f83205dfa..007c53f7ac 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -188,7 +188,6 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
     virStorageAuthDefPtr authdef = source->auth;
     g_autofree unsigned char *secret_value = NULL;
     size_t secret_value_size = 0;
-    VIR_AUTODISPOSE_STR rados_key = NULL;
     g_auto(virBuffer) mon_host = VIR_BUFFER_INITIALIZER;
     size_t i;
     const char *client_mount_timeout = "30";
@@ -199,6 +198,9 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
     g_autofree char *mon_buff = NULL;

     if (authdef) {
+        g_autofree char *rados_key = NULL;
+        int rc;
+
         VIR_DEBUG("Using cephx authorization, username: %s", authdef->username);

         if (rados_create(&ptr->cluster, authdef->username) < 0) {
@@ -218,8 +220,10 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
         rados_key = g_base64_encode(secret_value, secret_value_size);
         virSecureErase(secret_value, secret_value_size);

-        if (virStorageBackendRBDRADOSConfSet(ptr->cluster,
-                                             "key", rados_key) < 0)
+        rc = virStorageBackendRBDRADOSConfSet(ptr->cluster, "key", rados_key);
+        virSecureEraseString(rados_key);
+
+        if (rc < 0)
             goto cleanup;

         if (virStorageBackendRBDRADOSConfSet(ptr->cluster,
-- 
2.29.2