Commit cd9295c8 authored by Jan Altenberg's avatar Jan Altenberg Committed by Greg Kroah-Hartman

rtc_time_to_tm: fix signed/unsigned arithmetic

commit 73442daf upstream

commit 945185a6 ("rtc: rtc_time_to_tm: use
unsigned arithmetic") changed the some types in rtc_time_to_tm() to
unsigned:

 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-       register int days, month, year;
+       unsigned int days, month, year;

This doesn't work for all cases, because days is checked for < 0 later
on:

if (days < 0) {
	year -= 1;
	days += 365 + LEAP_YEAR(year);
}

I think the correct fix would be to keep days signed and do an appropriate
cast later on.
Signed-off-by: default avatarJan Altenberg <jan.altenberg@linutronix.de>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b6cdf4ee
...@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days); ...@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);
*/ */
void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
{ {
unsigned int days, month, year; unsigned int month, year;
int days;
days = time / 86400; days = time / 86400;
time -= days * 86400; time -= (unsigned int) days * 86400;
/* day of the week, 1970-01-01 was a Thursday */ /* day of the week, 1970-01-01 was a Thursday */
tm->tm_wday = (days + 4) % 7; tm->tm_wday = (days + 4) % 7;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment