[PATCH] drm/imagination: Destroy the common FW object when HWRT data setup fails

From: Suyuan Wang via B4 Relay

Date: Sat Nov 21 2026 - 10:29:23 EST


From: Suyuan Wang <stevewong@xxxxxxxxxxx>

If hwrt_data_init_fw_structure() fails in pvr_hwrt_dataset_create(),
the error path frees the per-data FW structures and then jumps straight
to err_fini_kernel_structure, skipping hwrt_fini_common_fw_structure().
The common FW object created just before is never destroyed, and its
init callback data is the hwrt that is then freed:

err = pvr_fw_object_create(pvr_dev, ...,
hwrtdata_common_init, hwrt,
&hwrt->common_fw_obj);

Besides leaking the object, this leaves it on the device's FW object
list, so a later pvr_fw_hard_reset() calls hwrtdata_common_init() with
the freed hwrt, and pvr_fw_fini() warns that the list is not empty.

Destroy the common FW object on that path, in the same order as
pvr_hwrt_dataset_release().

Found with a static analysis tool and checked by hand.

Fixes: 6eedddab733b ("drm/imagination: Implement free list and HWRT create and destroy ioctls")
Cc: stable@xxxxxxxxxxxxxxx
Co-developed-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Suyuan Wang <stevewong@xxxxxxxxxxx>
---
Compile tested on arm64 with clang (W=1, no new warnings). I don't have PowerVR hardware.
---
drivers/gpu/drm/imagination/pvr_hwrt.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/imagination/pvr_hwrt.c b/drivers/gpu/drm/imagination/pvr_hwrt.c
index 05c68c78da22..6057f8dd1eaf 100644
--- a/drivers/gpu/drm/imagination/pvr_hwrt.c
+++ b/drivers/gpu/drm/imagination/pvr_hwrt.c
@@ -487,6 +487,8 @@ pvr_hwrt_dataset_create(struct pvr_file *pvr_file,
while (--i >= 0)
hwrt_data_fini_fw_structure(hwrt, i);

+ hwrt_fini_common_fw_structure(hwrt);
+
err_fini_kernel_structure:
hwrt_fini_kernel_structure(hwrt);