From ae17467ecfb8ea74ef8beedbe9d692b18366437e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 23 Jun 2016 11:06:54 -0700 Subject: [PATCH] nvme: check BAR map return code before using addr Swap the order of checks in the failure check - if rc is not 0, addr may be garbage. Change-Id: I110710efd00397c777d59ac8b219ba3cc2156596 Signed-off-by: Daniel Verkamp --- lib/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 7f4f2ced3..85512b922 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -990,7 +990,7 @@ nvme_ctrlr_map_cmb(struct spdk_nvme_ctrlr *ctrlr) goto exit; rc = nvme_pcicfg_map_bar_write_combine(ctrlr->devhandle, bir, &addr); - if (addr == NULL || (rc != 0)) + if ((rc != 0) || addr == NULL) goto exit; ctrlr->cmb_bar_virt_addr = addr;