Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] RTC class: error checks

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>

authored by

David Brownell and committed by
Linus Torvalds
db621f17 818a8674

+5 -5
+4 -4
drivers/rtc/rtc-lib.c
··· 94 94 int rtc_valid_tm(struct rtc_time *tm) 95 95 { 96 96 if (tm->tm_year < 70 97 - || tm->tm_mon >= 12 97 + || ((unsigned)tm->tm_mon) >= 12 98 98 || tm->tm_mday < 1 99 99 || tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900) 100 - || tm->tm_hour >= 24 101 - || tm->tm_min >= 60 102 - || tm->tm_sec >= 60) 100 + || ((unsigned)tm->tm_hour) >= 24 101 + || ((unsigned)tm->tm_min) >= 60 102 + || ((unsigned)tm->tm_sec) >= 60) 103 103 return -EINVAL; 104 104 105 105 return 0;
+1 -1
drivers/rtc/rtc-proc.c
··· 61 61 seq_printf(seq, "%02d-", alrm.time.tm_mon + 1); 62 62 else 63 63 seq_printf(seq, "**-"); 64 - if ((unsigned int)alrm.time.tm_mday <= 31) 64 + if (alrm.time.tm_mday && (unsigned int)alrm.time.tm_mday <= 31) 65 65 seq_printf(seq, "%02d\n", alrm.time.tm_mday); 66 66 else 67 67 seq_printf(seq, "**\n");