From 1b161b6c7a43f95f3b135d18efa97a8429300617 Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Wed, 24 Jun 2020 16:40:40 -0700 Subject: 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 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 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sungwook Kim Reviewed-by: Rahul Jain (SW-TEGRA) Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/fb/fb_gv11b.c') 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, } nvgpu_udelay(5); } while (!nvgpu_timeout_expired_msg(&timeout, - "invalidate replay failed on 0x%llx")); + "invalidate replay failed 0x%lx", + invalidate_replay_val)); if (err) { nvgpu_err(g, "invalidate replay timedout"); } -- cgit v1.2.2