From: Jeff Lien <jeff.lien@wdc.com>
Date: Tue, 12 Oct 2021 19:15:10 +0000 (-0500)
Subject: [nvme-cli] Prevent nvme_free call on NULL buffer
X-Git-Tag: v2.0-rc0~74^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a2da4c6b6105c73dfab0f1ba92eae7a15482d94;p=users%2Fsagi%2Fnvme-cli.git

[nvme-cli] Prevent nvme_free call on NULL buffer

Signed-off-by: Jeff Lien <jeff.lien@wdc.com>
---

diff --git a/nvme.c b/nvme.c
index 66263196..3e9f5d28 100644
--- 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: