From 1c6f8082770c2aa16724b812d3bb14249482989e Mon Sep 17 00:00:00 2001
From: Pierre Lestringant <plestringant@kalray.eu>
Date: Mon, 21 Nov 2022 10:45:03 +0100
Subject: [PATCH] nvme: fix a possible NULL pointer deref

If calloc failed, there was a NULL pointer deref.

Signed-off-by: plestk <plestringant@kalray.eu>
Change-Id: I8e4104589a283349e7251c32b1decdfdd850b9ec
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15779
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 module/bdev/nvme/nvme_rpc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/bdev/nvme/nvme_rpc.c b/module/bdev/nvme/nvme_rpc.c
index 2b40b1389..82fc8494d 100644
--- a/module/bdev/nvme/nvme_rpc.c
+++ b/module/bdev/nvme/nvme_rpc.c
@@ -455,8 +455,9 @@ rpc_bdev_nvme_send_cmd(struct spdk_jsonrpc_request *request,
 	return;
 
 invalid:
+	if (ctx != NULL) {
+		free_rpc_bdev_nvme_send_cmd_ctx(ctx);
+	}
 	spdk_jsonrpc_send_error_response(request, error_code, spdk_strerror(-ret));
-	free_rpc_bdev_nvme_send_cmd_ctx(ctx);
-	return;
 }
 SPDK_RPC_REGISTER("bdev_nvme_send_cmd", rpc_bdev_nvme_send_cmd, SPDK_RPC_RUNTIME)