Skip to content

Commit 4919d3e

Browse files
rafaeljwalexandrebelloni
authored andcommitted
rtc: cmos: Fix event handler registration ordering issue
Because acpi_install_fixed_event_handler() enables the event automatically on success, it is incorrect to call it before the handler routine passed to it is ready to handle events. Unfortunately, the rtc-cmos driver does exactly the incorrect thing by calling cmos_wake_setup(), which passes rtc_handler() to acpi_install_fixed_event_handler(), before cmos_do_probe(), because rtc_handler() uses dev_get_drvdata() to get to the cmos object pointer and the driver data pointer is only populated in cmos_do_probe(). This leads to a NULL pointer dereference in rtc_handler() on boot if the RTC fixed event happens to be active at the init time. To address this issue, change the initialization ordering of the driver so that cmos_wake_setup() is always called after a successful cmos_do_probe() call. While at it, change cmos_pnp_probe() to call cmos_do_probe() after the initial if () statement used for computing the IRQ argument to be passed to cmos_do_probe() which is cleaner than calling it in each branch of that if () (local variable "irq" can be of type int, because it is passed to that function as an argument of type int). Note that commit 6492fed ("rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0") caused this issue to affect a larger number of systems, because previously it only affected systems with ACPI_FADT_LOW_POWER_S0 set, but it is present regardless of that commit. Fixes: 6492fed ("rtc: rtc-cmos: Do not check ACPI_FADT_LOW_POWER_S0") Fixes: a474aae ("rtc-cmos: move wake setup from ACPI glue into RTC driver") Link: https://lore.kernel.org/linux-acpi/[email protected]/ Reported-by: Mel Gorman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Bjorn Helgaas <[email protected]> Tested-by: Mel Gorman <[email protected]> Link: https://lore.kernel.org/r/5629262.DvuYhMxLoT@kreacher Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 8f08553 commit 4919d3e

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

drivers/rtc/rtc-cmos.c

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,10 +1352,10 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
13521352

13531353
static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
13541354
{
1355-
cmos_wake_setup(&pnp->dev);
1355+
int irq, ret;
13561356

13571357
if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {
1358-
unsigned int irq = 0;
1358+
irq = 0;
13591359
#ifdef CONFIG_X86
13601360
/* Some machines contain a PNP entry for the RTC, but
13611361
* don't define the IRQ. It should always be safe to
@@ -1364,13 +1364,17 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
13641364
if (nr_legacy_irqs())
13651365
irq = RTC_IRQ;
13661366
#endif
1367-
return cmos_do_probe(&pnp->dev,
1368-
pnp_get_resource(pnp, IORESOURCE_IO, 0), irq);
13691367
} else {
1370-
return cmos_do_probe(&pnp->dev,
1371-
pnp_get_resource(pnp, IORESOURCE_IO, 0),
1372-
pnp_irq(pnp, 0));
1368+
irq = pnp_irq(pnp, 0);
13731369
}
1370+
1371+
ret = cmos_do_probe(&pnp->dev, pnp_get_resource(pnp, IORESOURCE_IO, 0), irq);
1372+
if (ret)
1373+
return ret;
1374+
1375+
cmos_wake_setup(&pnp->dev);
1376+
1377+
return 0;
13741378
}
13751379

13761380
static void cmos_pnp_remove(struct pnp_dev *pnp)
@@ -1454,10 +1458,9 @@ static inline void cmos_of_init(struct platform_device *pdev) {}
14541458
static int __init cmos_platform_probe(struct platform_device *pdev)
14551459
{
14561460
struct resource *resource;
1457-
int irq;
1461+
int irq, ret;
14581462

14591463
cmos_of_init(pdev);
1460-
cmos_wake_setup(&pdev->dev);
14611464

14621465
if (RTC_IOMAPPED)
14631466
resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -1467,7 +1470,13 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
14671470
if (irq < 0)
14681471
irq = -1;
14691472

1470-
return cmos_do_probe(&pdev->dev, resource, irq);
1473+
ret = cmos_do_probe(&pdev->dev, resource, irq);
1474+
if (ret)
1475+
return ret;
1476+
1477+
cmos_wake_setup(&pdev->dev);
1478+
1479+
return 0;
14711480
}
14721481

14731482
static int cmos_platform_remove(struct platform_device *pdev)

0 commit comments

Comments
 (0)