summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Daifuku <pdaifuku@nvidia.com>2020-06-24 19:40:40 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2020-07-08 19:09:04 -0400
commit1b161b6c7a43f95f3b135d18efa97a8429300617 (patch)
tree69f470dcf1d7096a28a19fef9b949dd4370c9359
parent3d4a70a4b97e304d96663c87b2dc7f11330bf7ea (diff)
gpu: nvgpu: fix value leaked in log
The timeout message of nvgpu_timeout_expired_msg() leaks a stack value (%llx) in error log on timeout. As the format expects 1 argument and none is given, fix this by specifying the required argument. Manual port of https://git-master.nvidia.com/r/c/linux-nvgpu/+/2205423 Bug 2780861 Bug 3051385 Change-Id: Ic223e4b79bde718108826f095740b10b54a5e84d Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2366452 (cherry picked from commit 372837506af77e2c5b8489ee2123292778abe75d) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2370285 Reviewed-by: automaticguardword <automaticguardword@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sungwook Kim <sungwookk@nvidia.com> Reviewed-by: Rahul Jain (SW-TEGRA) <rahuljain@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> GVS: Gerrit_Virtual_Submit
-rw-r--r--drivers/gpu/nvgpu/common/fb/fb_gv11b.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index 49e8f385..89b92ef9 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -1504,7 +1504,8 @@ int gv11b_fb_mmu_invalidate_replay(struct gk20a *g,
1504 } 1504 }
1505 nvgpu_udelay(5); 1505 nvgpu_udelay(5);
1506 } while (!nvgpu_timeout_expired_msg(&timeout, 1506 } while (!nvgpu_timeout_expired_msg(&timeout,
1507 "invalidate replay failed on 0x%llx")); 1507 "invalidate replay failed 0x%lx",
1508 invalidate_replay_val));
1508 if (err) { 1509 if (err) {
1509 nvgpu_err(g, "invalidate replay timedout"); 1510 nvgpu_err(g, "invalidate replay timedout");
1510 } 1511 }