diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ba15015141285d169761f68cef5f1d370bc04b5a..470d4f37384180bfc595cc482f57ed9ddb2f06ec 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -184,7 +184,7 @@ int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd,
 			goto out_unmap;
 		}
 
-		if (meta_buffer) {
+		if (meta_buffer && meta_len) {
 			struct bio_integrity_payload *bip;
 
 			meta = kmalloc(meta_len, GFP_KERNEL);