External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

virStorageBackendRBDOpenRADOSConn: Use virSecureErase instead of VIR_DISPOSE_N

Browse Source 
Switch the secret value to 'g_autofree' for handling of the memory and
clear it out using virSecureErase.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-01 14:11:52 +01:00
parent e6195ed80c
commit 549305922a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/storage_backend_rbd.c
View File

@ -35,6 +35,7 @@
#include "rbd/librbd.h" #include "rbd/librbd.h"
#include "virsecret.h" #include "virsecret.h"
#include "storage_util.h" #include "storage_util.h"
#include "virsecureerase.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE #define VIR_FROM_THIS VIR_FROM_STORAGE
@ -185,7 +186,7 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
int ret = -1; int ret = -1;
virStoragePoolSourcePtr source = &def->source; virStoragePoolSourcePtr source = &def->source;
virStorageAuthDefPtr authdef = source->auth; virStorageAuthDefPtr authdef = source->auth;
unsigned char *secret_value = NULL; g_autofree unsigned char *secret_value = NULL;
size_t secret_value_size = 0; size_t secret_value_size = 0;
VIR_AUTODISPOSE_STR rados_key = NULL; VIR_AUTODISPOSE_STR rados_key = NULL;
g_auto(virBuffer) mon_host = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) mon_host = VIR_BUFFER_INITIALIZER;
@ -215,6 +216,7 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
goto cleanup; goto cleanup;
rados_key = g_base64_encode(secret_value, secret_value_size); rados_key = g_base64_encode(secret_value, secret_value_size);
virSecureErase(secret_value, secret_value_size);
if (virStorageBackendRBDRADOSConfSet(ptr->cluster, if (virStorageBackendRBDRADOSConfSet(ptr->cluster,
"key", rados_key) < 0) "key", rados_key) < 0)
@ -325,8 +327,6 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_DISPOSE_N(secret_value, secret_value_size);
virObjectUnref(conn); virObjectUnref(conn);
return ret; return ret;
} }