drm/v3d: Fix null pointer dereference of pointer perfmon
Subsystems (4)
PATCH 1/1 drm/v3d: Fix null pointer dereference of pointer perfmon
In the unlikely event that pointer perfmon is null the WARN_ON return path occurs after the pointer has already been deferenced. Fix this by only dereferencing perfmon after it has been null checked.
Fixes 26a4dc29b74a ("drm/v3d: Expose performance counters to userspace")
Signed-off-by Colin Ian King <[email protected]>
--- drivers/gpu/drm/v3d/v3d_perfmon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/v3d/v3d_perfmon.c +2 -1
@@ -25,11 +25,12 @@ void v3d_perfmon_start(struct v3d_dev *v3d, struct v3d_perfmon *perfmon) {unsigned int i;u32 mask; -u8 ncounters = perfmon->ncounters; +u8 ncounters;if (WARN_ON_ONCE (!perfmon || v3d->active_perfmon))return ; + ncounters = perfmon->ncounters; mask =GENMASK (ncounters -1 ,0 );for (i =0 ; i < ncounters; i++) {
Signature · 1 line
2.35.1
Quoted 6 lines · Colin Ian King
In the unlikely event that pointer perfmon is null the
WARN_ONreturn path
occurs after the pointer has already been deferenced. Fix this by only
dereferencing perfmon after it has been null checked.
Good catch!
Reviewed-by Juan A. Suarez <[email protected]>
J.A.
Quoted 11 lines · Juan A. Suárez
Quoted 6 lines · Colin Ian King
In the unlikely event that pointer perfmon is null the
WARN_ONreturn path
occurs after the pointer has already been deferenced. Fix this by only
dereferencing perfmon after it has been null checked.Good catch!
Reviewed-by Juan A. Suarez <[email protected]>
Applied to drm-misc-next.
Thanks,
Melissa
Quoted 4 lines
J.A.