Skip to content

Commit 555c95f

Browse files
committed
Merge: CVE-2024-53134: pmdomain: imx93-blk-ctrl: correct remove path
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5944 JIRA: https://issues.redhat.com/browse/RHEL-70045 CVE: CVE-2024-53134 ``` pmdomain: imx93-blk-ctrl: correct remove path The check condition should be 'i < bc->onecell_data.num_domains', not 'bc->onecell_data.num_domains' which will make the look never finish and cause kernel panic. Also disable runtime to address "imx93-blk-ctrl 4ac10000.system-controller: Unbalanced pm_runtime_enable!" Fixes: e9aa77d ("soc: imx: add i.MX93 media blk ctrl driver") Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Stefan Wahren <wahrenst@gmx.net> Cc: stable@vger.kernel.org Message-ID: <20241101101252.1448466-1-peng.fan@oss.nxp.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> (cherry picked from commit f7c7c5a) ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2024-12-05 04:02 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://gitlab.com/cki-project/kernel-workflow/-/issues/new?issue%5Btitle%5D=backporter%20webhook%20issue)</small> Approved-by: Radu Rendec <rrendec@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Julio Faracco <jfaracco@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Patrick Talbert <ptalbert@redhat.com>
2 parents 597fe6b + b27e912 commit 555c95f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/pmdomain/imx/imx93-blk-ctrl.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,9 @@ static int imx93_blk_ctrl_remove(struct platform_device *pdev)
298298

299299
of_genpd_del_provider(pdev->dev.of_node);
300300

301-
for (i = 0; bc->onecell_data.num_domains; i++) {
301+
pm_runtime_disable(&pdev->dev);
302+
303+
for (i = 0; i < bc->onecell_data.num_domains; i++) {
302304
struct imx93_blk_ctrl_domain *domain = &bc->domains[i];
303305

304306
pm_genpd_remove(&domain->genpd);

0 commit comments

Comments
 (0)