* [PATCH] rtc: cmos: Evaluate century appropriate
@ 2022-02-05 22:11 Mateusz Jończyk
2022-02-06 13:07 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Mateusz Jończyk @ 2022-02-05 22:11 UTC (permalink / raw)
To: stable, linux-rtc
Cc: Riwen Lu, Eric Wong, Mateusz Jończyk, Alexandre Belloni
From: Riwen Lu <luriwen@kylinos.cn>
commit ff164ae39b82ee483b24579c8e22a13a8ce5bd04 upstream.
There's limiting the year to 2069. When setting the rtc year to 2070,
reading it returns 1970. Evaluate century starting from 19 to count the
correct year.
$ sudo date -s 20700106
Mon 06 Jan 2070 12:00:00 AM CST
$ sudo hwclock -w
$ sudo hwclock -r
1970-01-06 12:00:49.604968+08:00
Fixes: 2a4daadd4d3e5071 ("rtc: cmos: ignore bogus century byte")
Signed-off-by: Riwen Lu <luriwen@kylinos.cn>
Acked-by: Eric Wong <e@80x24.org>
Reviewed-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20220106084609.1223688-1-luriwen@kylinos.cn
Signed-off-by: Mateusz Jończyk <mat.jonczyk@o2.pl> # preparation for stable
---
drivers/rtc/rtc-mc146818-lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Hello,
I have prepared this patch for inclusion into stable. Run-tested on top
of 5.16.7 and 4.9.299, works as intended.
Greetings,
Mateusz
diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c
index dcfaf09946ee..2065842f775d 100644
--- a/drivers/rtc/rtc-mc146818-lib.c
+++ b/drivers/rtc/rtc-mc146818-lib.c
@@ -104,7 +104,7 @@ unsigned int mc146818_get_time(struct rtc_time *time)
time->tm_year += real_year - 72;
#endif
- if (century > 20)
+ if (century > 19)
time->tm_year += (century - 19) * 100;
/*
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rtc: cmos: Evaluate century appropriate
2022-02-05 22:11 [PATCH] rtc: cmos: Evaluate century appropriate Mateusz Jończyk
@ 2022-02-06 13:07 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2022-02-06 13:07 UTC (permalink / raw)
To: Mateusz Jończyk
Cc: stable, linux-rtc, Riwen Lu, Eric Wong, Alexandre Belloni
On Sat, Feb 05, 2022 at 11:11:39PM +0100, Mateusz Jończyk wrote:
> From: Riwen Lu <luriwen@kylinos.cn>
>
> commit ff164ae39b82ee483b24579c8e22a13a8ce5bd04 upstream.
>
> There's limiting the year to 2069. When setting the rtc year to 2070,
> reading it returns 1970. Evaluate century starting from 19 to count the
> correct year.
>
> $ sudo date -s 20700106
> Mon 06 Jan 2070 12:00:00 AM CST
> $ sudo hwclock -w
> $ sudo hwclock -r
> 1970-01-06 12:00:49.604968+08:00
>
> Fixes: 2a4daadd4d3e5071 ("rtc: cmos: ignore bogus century byte")
>
> Signed-off-by: Riwen Lu <luriwen@kylinos.cn>
> Acked-by: Eric Wong <e@80x24.org>
> Reviewed-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Link: https://lore.kernel.org/r/20220106084609.1223688-1-luriwen@kylinos.cn
> Signed-off-by: Mateusz Jończyk <mat.jonczyk@o2.pl> # preparation for stable
> ---
> drivers/rtc/rtc-mc146818-lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Hello,
>
> I have prepared this patch for inclusion into stable. Run-tested on top
> of 5.16.7 and 4.9.299, works as intended.
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-06 13:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-05 22:11 [PATCH] rtc: cmos: Evaluate century appropriate Mateusz Jończyk
2022-02-06 13:07 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.