nvme: fix mem leak in multiple key related functions

Valgrind revealed mem leaks in multiple key related functions
including gen_tls_key() and check_tls_key() during insert, and
gen_dhchap_key(). This was traced to the respective cfg pointer
not getting freed after fetching the hostnqn string from the
hostnqn file. Fix the same.

Signed-off-by: Martin George <marting@netapp.com>

diff --git a/nvme.c b/nvme.c
index 096d43c9d006bbd713e33dcaee130ed2199c679b..c1d4352adcedb43bb80a877b4e54e7f739012263 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -8942,6 +8942,7 @@ static int gen_dhchap_key(int argc, char **argv, struct command *command, struct
        const char *nqn = "Host NQN to use for key transformation.";
 
        _cleanup_free_ unsigned char *raw_secret = NULL;
+       _cleanup_free_ char *hnqn = NULL;
        unsigned char key[68];
        char encoded_key[128];
        unsigned long crc = crc32(0L, NULL, 0);
@@ -9036,7 +9037,7 @@ static int gen_dhchap_key(int argc, char **argv, struct command *command, struct
        }
 
        if (!cfg.nqn) {
-               cfg.nqn = nvmf_hostnqn_from_file();
+               cfg.nqn = hnqn = nvmf_hostnqn_from_file();
                if (!cfg.nqn) {
                        nvme_show_error("Could not read host NQN");
                        return -ENOENT;
@@ -9163,6 +9164,7 @@ static int gen_tls_key(int argc, char **argv, struct command *command, struct pl
 
        _cleanup_free_ unsigned char *raw_secret = NULL;
        _cleanup_free_ char *encoded_key = NULL;
+       _cleanup_free_ char *hnqn = NULL;
        int key_len = 32;
        int err;
        long tls_key;
@@ -9217,7 +9219,7 @@ static int gen_tls_key(int argc, char **argv, struct command *command, struct pl
                        return -EINVAL;
                }
                if (!cfg.hostnqn) {
-                       cfg.hostnqn = nvmf_hostnqn_from_file();
+                       cfg.hostnqn = hnqn = nvmf_hostnqn_from_file();
                        if (!cfg.hostnqn) {
                                nvme_show_error("Failed to read host NQN");
                                return -EINVAL;
@@ -9284,6 +9286,7 @@ static int check_tls_key(int argc, char **argv, struct command *command, struct
        const char *insert = "Insert retained key into the keyring.";
 
        _cleanup_free_ unsigned char *decoded_key = NULL;
+       _cleanup_free_ char *hnqn = NULL;
        int decoded_len, err = 0;
        unsigned int hmac;
        long tls_key;
@@ -9338,7 +9341,7 @@ static int check_tls_key(int argc, char **argv, struct command *command, struct
 
        if (cfg.subsysnqn) {
                if (!cfg.hostnqn) {
-                       cfg.hostnqn = nvmf_hostnqn_from_file();
+                       cfg.hostnqn = hnqn = nvmf_hostnqn_from_file();
                        if (!cfg.hostnqn) {
                                nvme_show_error("Failed to read host NQN");
                                return -EINVAL;