Merge tag 'rtc-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

torvalds · torvalds · commit 453fa43cdb8e · 2021-09-15T17:06:01.000-07:00
Pull RTC fix from Alexandre Belloni:
 "Fix a locking issue in the cmos rtc driver"

* tag 'rtc-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: cmos: Disable irq around direct invocation of cmos_interrupt()
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
@@ -1047,7 +1047,9 @@ static void cmos_check_wkalrm(struct device *dev)
 	 * ACK the rtc irq here
 	 */
 	if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) {
+		local_irq_disable();
 		cmos_interrupt(0, (void *)cmos->rtc);
+		local_irq_enable();
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1047,7 +1047,9 @@ static void cmos_check_wkalrm(struct device *dev)`
`1047`	`1047`	`* ACK the rtc irq here`
`1048`	`1048`	`*/`
`1049`	`1049`	`if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) {`
	`1050`	`+ local_irq_disable();`
`1050`	`1051`	`cmos_interrupt(0, (void *)cmos->rtc);`
	`1052`	`+ local_irq_enable();`
`1051`	`1053`	`return;`
`1052`	`1054`	`}`
`1053`	`1055`