Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] RTC class: error checks

Browse source 
The rtc_is_valid_tm() routine needs to treat some of the fields it checks as
unsigned, to prevent wrongly accepting invalid rtc_time structs; this is the
same approach used elsewhere in the RTC code for such tests.

Conversely, rtc_proc_show() is missing one invalid-day-of-month test that
rtc_is_valid_tm() makes: there is no day zero.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
David Brownell 2006-09-30 23:28:16 -07:00 committed by Linus Torvalds
parent 818a8674b0
commit db621f174d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/rtc/rtc-lib.c
View file

@ -94,12 +94,12 @@ EXPORT_SYMBOL(rtc_time_to_tm);
int rtc_valid_tm(struct rtc_time *tm) int rtc_valid_tm(struct rtc_time *tm)
{ {
if (tm->tm_year < 70 if (tm->tm_year < 70
|| tm->tm_mon >= 12 || ((unsigned)tm->tm_mon) >= 12
|| tm->tm_mday < 1 || tm->tm_mday < 1
|| tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900) || tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900)
|| tm->tm_hour >= 24 || ((unsigned)tm->tm_hour) >= 24
|| tm->tm_min >= 60 || ((unsigned)tm->tm_min) >= 60
|| tm->tm_sec >= 60) || ((unsigned)tm->tm_sec) >= 60)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/rtc/rtc-proc.c
View file

@ -61,7 +61,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
seq_printf(seq, "%02d-", alrm.time.tm_mon + 1); seq_printf(seq, "%02d-", alrm.time.tm_mon + 1);
else else
seq_printf(seq, "**-"); seq_printf(seq, "**-");
if ((unsigned int)alrm.time.tm_mday <= 31) if (alrm.time.tm_mday && (unsigned int)alrm.time.tm_mday <= 31)
seq_printf(seq, "%02d\n", alrm.time.tm_mday); seq_printf(seq, "%02d\n", alrm.time.tm_mday);
else else
seq_printf(seq, "**\n"); seq_printf(seq, "**\n");