Commit f509a081 authored by Quentin Schulz's avatar Quentin Schulz Committed by Tomeu Vizoso
Browse files

accel/rocket: fix unwinding in error path in rocket_core_init 



When rocket_job_init() is called, iommu_group_get() has already been
called, therefore we should call iommu_group_put() and make the
iommu_group pointer NULL. This aligns with what's done in
rocket_core_fini().

If pm_runtime_resume_and_get() somehow fails, not only should
rocket_job_fini() be called but we should also unwind everything done
before that, that is, disable PM, put the iommu_group, NULLify it and
then call rocket_job_fini(). This is exactly what's done in
rocket_core_fini() so let's call that function instead of duplicating
the code.

Fixes: 0810d5ad ("accel/rocket: Add job submission IOCTL")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: default avatarTomeu Vizoso <tomeu@tomeuvizoso.net>
Signed-off-by: default avatarTomeu Vizoso <tomeu@tomeuvizoso.net>
Link: https://patch.msgid.link/20251215-rocket-error-path-v1-1-eec3bf29dc3b@cherry.de
parent bafb6863

drivers/accel/rocket/rocket_core.c

+5 −2
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ int rocket_core_init(struct rocket_core *core) 
	core->iommu_group = iommu_group_get(dev);



	err = rocket_job_init(core);

	if (err)

	if (err) {

		iommu_group_put(core->iommu_group);

		core->iommu_group = NULL;

		return err;

	}



	pm_runtime_use_autosuspend(dev);
@@ -76,7 +79,7 @@ int rocket_core_init(struct rocket_core *core) 


	err = pm_runtime_resume_and_get(dev);

	if (err) {

		rocket_job_fini(core);

		rocket_core_fini(core);

		return err;

	}