From d4cb2eb3c094989fbc756067398191a858e29021 Mon Sep 17 00:00:00 2001 From: Jinesh Parakh Date: Tue, 22 Mar 2022 19:31:27 +0530 Subject: [PATCH] gpu: nvgpu: Fix Dereference Coverity issues Fixed following Coverity Defects: fw.c : Dereference after null check channel.c : Dereference before null check log.c : Dereference before null check CID 10064128 CID 10056456 CID 10127934 Bug 3460991 Signed-off-by: Jinesh Parakh Change-Id: I9c075f5c38c2254d5c656af58bb002714bd53396 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2685320 Reviewed-by: Sagar Kamble Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Sachin Nikam GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/fifo/channel.c | 22 ++++++---------------- drivers/gpu/nvgpu/common/pmu/fw/fw.c | 4 ++++ drivers/gpu/nvgpu/os/linux/log.c | 4 ++-- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c index 213799292..6f3317a96 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel.c +++ b/drivers/gpu/nvgpu/common/fifo/channel.c @@ -478,26 +478,16 @@ int nvgpu_channel_add_job(struct nvgpu_channel *c, } } - if (c != NULL) { - job->num_mapped_buffers = num_mapped_buffers; - job->mapped_buffers = mapped_buffers; + job->num_mapped_buffers = num_mapped_buffers; + job->mapped_buffers = mapped_buffers; - nvgpu_channel_launch_wdt(c); + nvgpu_channel_launch_wdt(c); - nvgpu_channel_joblist_lock(c); - nvgpu_channel_joblist_add(c, job); - nvgpu_channel_joblist_unlock(c); - } else { - err = -ETIMEDOUT; - goto err_put_buffers; - } + nvgpu_channel_joblist_lock(c); + nvgpu_channel_joblist_add(c, job); + nvgpu_channel_joblist_unlock(c); return 0; - -err_put_buffers: - nvgpu_vm_put_buffers(vm, mapped_buffers, num_mapped_buffers); - - return err; } /** diff --git a/drivers/gpu/nvgpu/common/pmu/fw/fw.c b/drivers/gpu/nvgpu/common/pmu/fw/fw.c index 89a7a1413..12e3da736 100644 --- a/drivers/gpu/nvgpu/common/pmu/fw/fw.c +++ b/drivers/gpu/nvgpu/common/pmu/fw/fw.c @@ -173,6 +173,10 @@ static void pmu_fw_release(struct gk20a *g, struct pmu_rtos_fw *rtos_fw) nvgpu_log_fn(g, " "); + if (rtos_fw == NULL) { + return; + } + if (rtos_fw->fw_sig != NULL) { nvgpu_release_firmware(g, rtos_fw->fw_sig); } diff --git a/drivers/gpu/nvgpu/os/linux/log.c b/drivers/gpu/nvgpu/os/linux/log.c index 8473c6c23..16e1f875c 100644 --- a/drivers/gpu/nvgpu/os/linux/log.c +++ b/drivers/gpu/nvgpu/os/linux/log.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2022, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -124,7 +124,7 @@ void nvgpu_log_dbg_impl(struct gk20a *g, u64 log_mask, (void) vsnprintf(log, LOG_BUFFER_LENGTH, fmt, args); va_end(args); - __nvgpu_really_print_log(g->log_trace, g ? nvgpu_log_name(g) : "", + __nvgpu_really_print_log(g->log_trace, nvgpu_log_name(g), func_name, line, NVGPU_DEBUG, log); }