From 5943f5fc9d445171004effd9581c6eef494977f2 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 11 Jun 2019 15:28:48 -0700 Subject: [PATCH] gpu: nvgpu: fix CERT EXP34-C in common.gr.falcon Fixed CERT EXP34-C error in gr_falcon driver by checking for valid nvgpu_firmware pointer, before calling nvgpu_release_firmware. JIRA NVGPU-3622 Change-Id: Ief4973ce4b73aa5348460632693d18e6104eda47 Signed-off-by: Seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/2134674 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/gr/gr_falcon.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gr/gr_falcon.c b/drivers/gpu/nvgpu/common/gr/gr_falcon.c index 4614c5267..7745eda08 100644 --- a/drivers/gpu/nvgpu/common/gr/gr_falcon.c +++ b/drivers/gpu/nvgpu/common/gr/gr_falcon.c @@ -374,10 +374,14 @@ clean_up: } nvgpu_dma_free(g, &ucode_info->surface_desc); - nvgpu_release_firmware(g, gpccs_fw); - gpccs_fw = NULL; - nvgpu_release_firmware(g, fecs_fw); - fecs_fw = NULL; + if (gpccs_fw != NULL) { + nvgpu_release_firmware(g, gpccs_fw); + gpccs_fw = NULL; + } + if (fecs_fw != NULL) { + nvgpu_release_firmware(g, fecs_fw); + fecs_fw = NULL; + } return err; }