rtc-s3c.c: fix time setting checks
PATCH 1/1 rtc-s3c.c: fix time setting checks
Fix the checking of the range for the year when
setting time with the S3C24XX RTC driver
Signed-off-by Ben Dooks <[email protected]>
drivers/rtc/rtc-s3c.c +10 -7
@@ -11,6 +11,8 @@* S3C2410/S3C2440/S3C24XX Internal RTC Driver */ +//B#define DEBUG +#include <linux/module.h> #include <linux/fs.h> #include <linux/string.h>
@@ -153,24 +155,25 @@ static int s3c_rtc_gettime(struct devicestatic int s3c_rtc_settime (struct device *dev,struct rtc_time *tm) {void __iomem *base = s3c_rtc_base; +int year = tm->tm_year -100 ; + +pr_debug ("set time %02d.%02d.%02d %02d/%02d/%02d\n" , + tm->tm_year, tm->tm_mon, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); -/* the rtc gets round the y2k problem by just not supporting it */ +/* we get around y2k by simply not supporting it */ -if (tm->tm_year >100 ) { +if (year <0 || year >=100 ) {dev_err (dev,"rtc only supports 100 years\n" );return -EINVAL ; } -pr_debug ("set time %02d.%02d.%02d %02d/%02d/%02d\n" , - tm->tm_year, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); -writeb (BIN2BCD (tm->tm_sec), base +S3C2410_RTCSEC );writeb (BIN2BCD (tm->tm_min), base +S3C2410_RTCMIN );writeb (BIN2BCD (tm->tm_hour), base +S3C2410_RTCHOUR );writeb (BIN2BCD (tm->tm_mday), base +S3C2410_RTCDATE );writeb (BIN2BCD (tm->tm_mon +1 ), base +S3C2410_RTCMON ); -writeb (BIN2BCD (tm->tm_year -100 ), base +S3C2410_RTCYEAR ); +writeb (BIN2BCD (year), base +S3C2410_RTCYEAR );return 0 ; }
Quoted 9 lines · Ben Dooks
Fix the checking of the range for the year when
setting time with the S3C24XX RTC driverSigned-off-by Ben Dooks <[email protected]>diff -urpN -X ../dontdiff
linux-2.6.18-rc4-all1/drivers/rtc/rtc-s3c.clinux-2.6.18-rc4-all2/drivers/rtc/rtc-s3c.c
drivers/rtc/rtc-s3c.c line 15
Quoted 5 lines
drivers/rtc/rtc-s3c.c +2
-0@@ -11,6 +11,8 @@* S3C2410/S3C2440/S3C24XX Internal RTC Driver */ +//B#define DEBUG +
But what's this?
Quoted 26 lines
drivers/rtc/rtc-s3c.c +7
-6#include <linux/module.h> #include <linux/fs.h> #include <linux/string.h> @@ -153,24 +155,25 @@ static int s3c_rtc_gettime(struct devicestatic int s3c_rtc_settime (struct device *dev,struct rtc_time *tm) {void __iomem *base = s3c_rtc_base; +int year = tm->tm_year -100 ; + +pr_debug ("set time %02d.%02d.%02d %02d/%02d/%02d\n" , + tm->tm_year, tm->tm_mon, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); -/* the rtc gets round the y2k problem by just not supporting it */ +/* we get around y2k by simply not supporting it */ -if (tm->tm_year >100 ) { +if (year <0 || year >=100 ) {dev_err (dev,"rtc only supports 100 years\n" );return -EINVAL ; } -pr_debug ("set time %02d.%02d.%02d %02d/%02d/%02d\n" , - tm->tm_year, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); -
drivers/rtc/rtc-s3c.c static int s3c_rtc_gettime(struct device · line 179
Quoted 10 lines
drivers/rtc/rtc-s3c.c +1
-1writeb (BIN2BCD (tm->tm_sec), base +S3C2410_RTCSEC );writeb (BIN2BCD (tm->tm_min), base +S3C2410_RTCMIN );writeb (BIN2BCD (tm->tm_hour), base +S3C2410_RTCHOUR );writeb (BIN2BCD (tm->tm_mday), base +S3C2410_RTCDATE );writeb (BIN2BCD (tm->tm_mon +1 ), base +S3C2410_RTCMON ); -writeb (BIN2BCD (tm->tm_year -100 ), base +S3C2410_RTCYEAR ); +writeb (BIN2BCD (year), base +S3C2410_RTCYEAR );return 0 ; }
regards,
Signature · 4 lines
http://www.fi.muni.cz/~xslaby/ Jiri Slaby faculty of informatics, masaryk university, brno, cz e-mail: jirislaby gmail com, gpg pubkey fingerprint: B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E