Commit 6378c51b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Heyuan Wang
Browse files

rtc: cmos: Fix wake alarm breakage 

mainline inclusion
from mainline-v6.1-rc3
commit 0782b66e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRDI
CVE: CVE-2022-48953

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0782b66ed2fbb035dda76111df0954515e417b24



----------------------------------------------------

Commit 4919d3eb ("rtc: cmos: Fix event handler registration
ordering issue") overlooked the fact that cmos_do_probe() depended
on the preparations carried out by cmos_wake_setup() and the wake
alarm stopped working after the ordering of them had been changed.

Address this by partially reverting commit 4919d3eb so that
cmos_wake_setup() is called before cmos_do_probe() again and moving
the rtc_wake_setup() invocation from cmos_wake_setup() directly to the
callers of cmos_do_probe() where it will happen after a successful
completion of the latter.

Fixes: 4919d3eb ("rtc: cmos: Fix event handler registration ordering issue")
Reported-by: default avatarZhang Rui <rui.zhang@intel.com>
Reported-by: default avatarTodd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/5887691.lOV4Wx5bFT@kreacher


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarHeyuan Wang <wangheyuan2@h-partners.com>
parent 0ee50951

drivers/rtc/rtc-cmos.c

+8 −3
Original line number Diff line number Diff line
@@ -1179,6 +1179,9 @@ static u32 rtc_handler(void *context) 


static inline void rtc_wake_setup(struct device *dev)

{

	if (acpi_disabled)

		return;



	acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev);

	/*

	 * After the RTC handler is installed, the Fixed_RTC event should
@@ -1235,7 +1238,6 @@ static void cmos_wake_setup(struct device *dev) 


	use_acpi_alarm_quirks();



	rtc_wake_setup(dev);

	acpi_rtc_info.wake_on = rtc_wake_on;

	acpi_rtc_info.wake_off = rtc_wake_off;
@@ -1303,6 +1305,8 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) 
{

	int irq, ret;



	cmos_wake_setup(&pnp->dev);



	if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {

		irq = 0;

#ifdef CONFIG_X86
@@ -1321,7 +1325,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) 
	if (ret)

		return ret;



	cmos_wake_setup(&pnp->dev);

	rtc_wake_setup(&pnp->dev);



	return 0;

}
@@ -1410,6 +1414,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev) 
	int irq, ret;



	cmos_of_init(pdev);

	cmos_wake_setup(&pdev->dev);



	if (RTC_IOMAPPED)

		resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -1423,7 +1428,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	cmos_wake_setup(&pdev->dev);

	rtc_wake_setup(&pdev->dev);



	return 0;

}