rtc-mc146818-lib: fix locking in mc146818_set_time
Subsystems (2)
PATCH 1/1 rtc-mc146818-lib: fix locking in mc146818_set_time
In mc146818_set_time(), CMOS_READ(RTC_CONTROL) was performed without the rtc_lock taken, which is required for CMOS accesses. Fix this.
Nothing in kernel modifies RTC_DM_BINARY, so a separate critical section is allowed here.
Fixes dcf257e92622 ("rtc: mc146818: Reduce spinlock section in mc146818_set_time()")
Signed-off-by Mateusz Jończyk <[email protected]>
Cc Alessandro Zummo <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Thomas Gleixner <[email protected]>
--- drivers/rtc/rtc-mc146818-lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/rtc/rtc-mc146818-lib.c +4 -2
@@ -232,8 +232,10 @@ int mc146818_set_time(struct rtc_time *time)if (yrs >=100 ) yrs -=100 ; -if (!(CMOS_READ (RTC_CONTROL ) &RTC_DM_BINARY ) - ||RTC_ALWAYS_BCD ) { +spin_lock_irqsave (&rtc_lock, flags); + save_control =CMOS_READ (RTC_CONTROL ); +spin_unlock_irqrestore (&rtc_lock, flags); +if (!(save_control &RTC_DM_BINARY ) ||RTC_ALWAYS_BCD ) { sec =bin2bcd (sec); min =bin2bcd (min); hrs =bin2bcd (hrs);
base-commit: 754e0b0e35608ed5206d6a67a791563c631cec07
Signature · 1 line
2.25.1
Quoted 8 lines · Mateusz Jończyk
In
mc146818_set_time(),CMOS_READ(RTC_CONTROL)was performed without thertc_locktaken, which is required for CMOS accesses. Fix this.Nothing in kernel modifies
RTC_DM_BINARY, so a separate critical section is allowed here.[...]
Applied, thanks!
[1/1] rtc-mc146818-lib: fix locking in mc146818_set_time
commit: c63cdb340a7e0bd3734f9f8e27f082a054b45887
Best regards,
Signature · 1 line
Alexandre Belloni <[email protected]>