drm/vc4: perfmon: Fix variable dereferenced before check
Subsystems (3)
PATCH 1/1 drm/vc4: perfmon: Fix variable dereferenced before check
Commit 30f8c74ca9b7 ("drm/vc4: Warn if some v3d code is run on BCM2711") introduced a check in vc4_perfmon_get() that dereferences a pointer before we checked whether that pointer is valid or not.
Let's rework that function a bit to do things in the proper order.
--- drivers/gpu/drm/vc4/vc4_perfmon.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/vc4/vc4_perfmon.c +6 -3
@@ -17,13 +17,16 @@void vc4_perfmon_get (struct vc4_perfmon *perfmon) { -struct vc4_dev *vc4 = perfmon->dev; +struct vc4_dev *vc4; +if (!perfmon) +return ; + + vc4 = perfmon->dev;if (WARN_ON_ONCE (vc4->is_vc5))return ; -if (perfmon) -refcount_inc (&perfmon->refcnt); +refcount_inc (&perfmon->refcnt); }void vc4_perfmon_put (struct vc4_perfmon *perfmon)
Signature · 1 line
2.36.1
Quoted 10 lines · Maxime Ripard
Commit
30f8c74ca9b7("drm/vc4: Warn if some v3d code is run on BCM2711") introduced a check invc4_perfmon_get()that dereferences a pointer before we checked whether that pointer is valid or not.Let's rework that function a bit to do things in the proper order.
Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Fixes 30f8c74ca9b7 ("drm/vc4: Warn if some v3d code is run on BCM2711")Signed-off-by Maxime Ripard <[email protected]>
I was about to send the same patch because Coverity reported this issue today, but you already found and fixed it :D
Best wishes,
José Expósito
Maxime Ripard
AppliedRe: (subset) [PATCH] drm/vc4: perfmon: Fix variable dereferenced before check
In reply to Maxime RipardQuoted 8 lines · Maxime Ripard
Commit
30f8c74ca9b7("drm/vc4: Warn if some v3d code is run on BCM2711") introduced a check invc4_perfmon_get()that dereferences a pointer before we checked whether that pointer is valid or not.Let's rework that function a bit to do things in the proper order.
[...]
Applied to drm/drm-misc (drm-misc-fixes).
Thanks!
Maxime