ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: avoid a null dereference before null check

Browse Source 
We do the null check for 'fc_req', but already dereferenced it
before the check. Swap their position to avoid null dereference.

Fixes issue #2395.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11721 (master)

(cherry picked from commit 30af49f77d)
Change-Id: I33b9e6b51b54f6ada9c072cf7ab0acda2622472f
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12471
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Weiguo Li 2022-02-24 01:21:59 +08:00 committed by Keith Lucas
parent 8282628ec1
commit 323beab1a3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nvmf/fc.c
View File

@ -1586,12 +1586,13 @@ nvmf_fc_hwqp_handle_request(struct spdk_nvmf_fc_hwqp *hwqp, struct spdk_nvmf_fc_
void
_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req)
{
struct spdk_nvmf_fc_hwqp *hwqp = fc_req->hwqp;
struct spdk_nvmf_fc_hwqp *hwqp;
struct spdk_nvmf_transport_poll_group *group;
if (!fc_req) {
return;
}
hwqp = fc_req->hwqp;
if (fc_req->xchg) {
nvmf_fc_put_xchg(hwqp, fc_req->xchg);