Merge: PCI/pwrctrl: Cancel outstanding rescan work when unregistering

CKI KWF Bot · CKI KWF Bot · commit 12eaead5033a · 2025-07-29T20:08:32.000-04:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1197 ``` JIRA: https://issues.redhat.com/browse/RHEL-103213 CVE: CVE-2025-38137 Signed-off-by: Myron Stowe <mstowe@redhat.com> ``` Approved-by: John W. Linville <linville@redhat.com> Approved-by: Jennifer Berringer <jberring@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
diff --git a/drivers/pci/pwrctrl/core.c b/drivers/pci/pwrctrl/core.c
@@ -101,6 +101,8 @@ EXPORT_SYMBOL_GPL(pci_pwrctrl_device_set_ready);
  */
 void pci_pwrctrl_device_unset_ready(struct pci_pwrctrl *pwrctrl)
 {
+	cancel_work_sync(&pwrctrl->work);
+
 	/*
 	 * We don't have to delete the link here. Typically, this function
 	 * is only called when the power control device is being detached. If

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ EXPORT_SYMBOL_GPL(pci_pwrctrl_device_set_ready);`
`101`	`101`	`*/`
`102`	`102`	`void pci_pwrctrl_device_unset_ready(struct pci_pwrctrl *pwrctrl)`
`103`	`103`	`{`
	`104`	`+ cancel_work_sync(&pwrctrl->work);`
	`105`	`+`
`104`	`106`	`/*`
`105`	`107`	`* We don't have to delete the link here. Typically, this function`
`106`	`108`	`* is only called when the power control device is being detached. If`