From 8df52a0f4acf584f791f8fbf31130352d5f15c80 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 18 Jul 2019 07:36:02 -0400 Subject: [PATCH] lib/nvme_tcp: assert tcp_req->req before it is dereferenced The value of tcp_req->req was asserted after it was already dereferenced. This patch fixes that. Change-Id: I5eb01e88be09d41fb8e632c49d5a7ccf2315788f Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/462508 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- lib/nvme/nvme_tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 1842e59af..a7d7c181e 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -1882,11 +1882,11 @@ nvme_tcp_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair) cpl.status.sct = SPDK_NVME_SCT_GENERIC; TAILQ_FOREACH_SAFE(tcp_req, &tqpair->outstanding_reqs, link, tmp) { - if (tcp_req->req->cmd.opc != SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) { - continue; - } assert(tcp_req->req != NULL); req = tcp_req->req; + if (req->cmd.opc != SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) { + continue; + } nvme_tcp_req_complete(req, &cpl); nvme_tcp_req_put(tqpair, tcp_req);