]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
[nvme-cli] Prevent nvme_free call on NULL buffer
authorJeff Lien <jeff.lien@wdc.com>
Tue, 12 Oct 2021 19:15:10 +0000 (14:15 -0500)
committerJeff Lien <jeff.lien@wdc.com>
Tue, 12 Oct 2021 20:34:32 +0000 (15:34 -0500)
Signed-off-by: Jeff Lien <jeff.lien@wdc.com>
nvme.c

diff --git a/nvme.c b/nvme.c
index 662631967ebea43633e2fd0b3e2ebf942eb26294..3e9f5d28153d621fe7f0c2570fd16380de102eec 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -105,8 +105,10 @@ static void *__nvme_alloc(size_t len, bool *huge) {
 #ifdef LIBHUGETLBFS
 void nvme_free(void *p, bool huge)
 {
-       if (huge)
-               free_hugepage_region(p);
+       if (huge) {
+               if (p)
+                       free_hugepage_region(p);
+       }
        else
                free(p);
 }
@@ -5747,7 +5749,7 @@ static int passthru(int argc, char **argv, bool admin,
                        d_raw((unsigned char *)data, cfg.data_len);
        }
 free_data:
-       nvme_free(data, huge);
+               nvme_free(data, huge);
 free_metadata:
        free(metadata);
 close_wfd: