github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/imagination: Fixed oops when misusing ioctl CREATE_HWRT_DATASET

Browse Source 
While writing the matching IGT suite I discovered that it's possible to
cause a kernel oops when using DRM_IOCTL_PVR_CREATE_HWRT_DATASET when
the call to hwrt_init_common_fw_structure() fails.

Use an unwind-type error path to avoid cleaning up the object using the
the release function before it is fully resolved.

Signed-off-by: Donald Robson <donald.robson@imgtec.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231208163019.95913-1-donald.robson@imgtec.com
This commit is contained in:
Donald Robson 2023-12-08 16:30:19 +00:00 committed by Maxime Ripard
parent b39610c773
commit f1f55ed3ff
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/imagination/pvr_hwrt.c
View File

@ -458,7 +458,7 @@ pvr_hwrt_dataset_create(struct pvr_file *pvr_file,
struct drm_pvr_ioctl_create_hwrt_dataset_args *args)
{
struct pvr_hwrt_dataset *hwrt;
int err;
int err, i = 0;
/* Create and fill out the kernel structure */
hwrt = kzalloc(sizeof(*hwrt), GFP_KERNEL);
@ -466,35 +466,36 @@ pvr_hwrt_dataset_create(struct pvr_file *pvr_file,
if (!hwrt)
return ERR_PTR(-ENOMEM);
kref_init(&hwrt->ref_count);
err = hwrt_init_kernel_structure(pvr_file, args, hwrt);
if (err < 0)
goto err_free;
err = hwrt_init_common_fw_structure(pvr_file, args, hwrt);
if (err < 0)
goto err_free;
goto err_fini_kernel_structure;
for (int i = 0; i < ARRAY_SIZE(hwrt->data); i++) {
for (; i < ARRAY_SIZE(hwrt->data); i++) {
err = hwrt_data_init_fw_structure(pvr_file, hwrt, args,
&args->rt_data_args[i],
&hwrt->data[i]);
if (err < 0) {
i--;
/* Destroy already created structures. */
for (; i >= 0; i--)
hwrt_data_fini_fw_structure(hwrt, i);
goto err_free;
}
if (err < 0)
goto err_fini_data_structures;
hwrt->data[i].hwrt_dataset = hwrt;
}
kref_init(&hwrt->ref_count);
return hwrt;
err_fini_data_structures:
while (--i >= 0)
hwrt_data_fini_fw_structure(hwrt, i);
err_fini_kernel_structure:
hwrt_fini_kernel_structure(hwrt);
err_free:
pvr_hwrt_dataset_put(hwrt);
kfree(hwrt);
return ERR_PTR(err);
}