From 76aac6b183a0873545a081d8883c2348a857f07c Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Thu, 9 May 2019 14:30:33 -0700 Subject: [PATCH] gpu: nvgpu: MISRA 21.6 fixes in hal netlist Use strcpy/strcat instead of sprintf to fix MISRA 21.6 violations. JIRA NVGPU-3420 Change-Id: I70314bc9b407370961bd46434bb355ebb8d1df7d Signed-off-by: Seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/2115925 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.c | 10 +++++----- drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.c | 10 +++++----- drivers/gpu/nvgpu/hal/netlist/netlist_gv100.c | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.c | 10 +++++----- drivers/gpu/nvgpu/hal/netlist/netlist_tu104.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.c b/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.c index 2fbd5bdd5..5001877bd 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.c +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.c @@ -31,27 +31,27 @@ int gm20b_netlist_get_name(struct gk20a *g, int index, char *name) switch (index) { #ifdef GM20B_NETLIST_IMAGE_FW_NAME case NETLIST_FINAL: - (void) sprintf(name, GM20B_NETLIST_IMAGE_FW_NAME); + (void) strcpy(name, GM20B_NETLIST_IMAGE_FW_NAME); break; #endif #ifdef GK20A_NETLIST_IMAGE_A case NETLIST_SLOT_A: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_A); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_A); break; #endif #ifdef NVGPU_NETLIST_IMAGE_B case NETLIST_SLOT_B: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_B); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_B); break; #endif #ifdef NVGPU_NETLIST_IMAGE_C case NETLIST_SLOT_C: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_C); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_C); break; #endif #ifdef NVGPU_NETLIST_IMAGE_D case NETLIST_SLOT_D: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_D); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_D); break; #endif default: diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.c b/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.c index eb812bbc9..84f65cce5 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.c +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.c @@ -31,27 +31,27 @@ int gp10b_netlist_get_name(struct gk20a *g, int index, char *name) switch (index) { #ifdef GP10B_NETLIST_IMAGE_FW_NAME case NETLIST_FINAL: - (void) sprintf(name, GP10B_NETLIST_IMAGE_FW_NAME); + (void) strcpy(name, GP10B_NETLIST_IMAGE_FW_NAME); break; #endif #ifdef NVGPU_NETLIST_IMAGE_A case NETLIST_SLOT_A: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_A); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_A); break; #endif #ifdef NVGPU_NETLIST_IMAGE_B case NETLIST_SLOT_B: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_B); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_B); break; #endif #ifdef NVGPU_NETLIST_IMAGE_C case NETLIST_SLOT_C: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_C); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_C); break; #endif #ifdef NVGPU_NETLIST_IMAGE_D case NETLIST_SLOT_D: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_D); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_D); break; #endif default: diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.c b/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.c index 380a4dcb5..c4eb4a337 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.c +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.c @@ -30,8 +30,8 @@ int gv100_netlist_get_name(struct gk20a *g, int index, char *name) switch (ver) { case NVGPU_GPUID_GV100: - (void) sprintf(name, "%s/%s", "gv100", - GV100_NETLIST_IMAGE_FW_NAME); + (void) strcpy(name, "gv100/"); + (void) strcat(name, GV100_NETLIST_IMAGE_FW_NAME); break; default: nvgpu_err(g, "no support for GPUID %x", ver); diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.c b/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.c index 651f76c0f..cc220a467 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.c +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.c @@ -31,27 +31,27 @@ int gv11b_netlist_get_name(struct gk20a *g, int index, char *name) switch (index) { #ifdef GV11B_NETLIST_IMAGE_FW_NAME case NETLIST_FINAL: - (void) sprintf(name, GV11B_NETLIST_IMAGE_FW_NAME); + (void) strcpy(name, GV11B_NETLIST_IMAGE_FW_NAME); break; #endif #ifdef NVGPU_NETLIST_IMAGE_A case NETLIST_SLOT_A: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_A); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_A); break; #endif #ifdef NVGPU_NETLIST_IMAGE_B case NETLIST_SLOT_B: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_B); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_B); break; #endif #ifdef NVGPU_NETLIST_IMAGE_C case NETLIST_SLOT_C: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_C); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_C); break; #endif #ifdef NVGPU_NETLIST_IMAGE_D case NETLIST_SLOT_D: - (void) sprintf(name, NVGPU_NETLIST_IMAGE_D); + (void) strcpy(name, NVGPU_NETLIST_IMAGE_D); break; #endif default: diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.c b/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.c index 6757ea70a..f05ef58dc 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.c +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.c @@ -31,8 +31,8 @@ int tu104_netlist_get_name(struct gk20a *g, int index, char *name) switch (ver) { case NVGPU_GPUID_TU104: - (void) sprintf(name, "%s/%s", "tu104", - TU104_NETLIST_IMAGE_FW_NAME); + (void) strcpy(name, "tu104/"); + (void) strcat(name, TU104_NETLIST_IMAGE_FW_NAME); break; default: nvgpu_err(g, "no support for GPUID %x", ver);