diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-07-18 11:08:59 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-07-19 19:11:12 +0200 |
| commit | c421ce7265ce0280453811f4447ede754ebe7e66 (patch) | |
| tree | c9696649f5eb6ba8ede13e2cbe94b9beeead97cc /drivers/rtc/rtc-pcf85063.c | |
| parent | bb9dbb01bef96f058f55b984e43a33894c624065 (diff) | |
| download | linux-c421ce7265ce0280453811f4447ede754ebe7e66.tar.gz linux-c421ce7265ce0280453811f4447ede754ebe7e66.tar.bz2 linux-c421ce7265ce0280453811f4447ede754ebe7e66.zip | |
rtc: pcf85063: fix year range
The year range is not validated properly
As the driver has been mainlined in 2014, it is not an issue to stop
handling dates between 1970 and 2000 with the benefit of handling dates up
to 2100.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-pcf85063.c')
| -rw-r--r-- | drivers/rtc/rtc-pcf85063.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c index e8ddbb359d11..437638eb68a7 100644 --- a/drivers/rtc/rtc-pcf85063.c +++ b/drivers/rtc/rtc-pcf85063.c @@ -55,10 +55,6 @@ static int pcf85063_stop_clock(struct i2c_client *client, u8 *ctrl1) return 0; } -/* - * In the routines that deal directly with the pcf85063 hardware, we use - * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch. - */ static int pcf85063_get_datetime(struct i2c_client *client, struct rtc_time *tm) { int rc; @@ -90,8 +86,7 @@ static int pcf85063_get_datetime(struct i2c_client *client, struct rtc_time *tm) tm->tm_wday = regs[4] & 0x07; tm->tm_mon = bcd2bin(regs[5] & 0x1F) - 1; /* rtc mn 1-12 */ tm->tm_year = bcd2bin(regs[6]); - if (tm->tm_year < 70) - tm->tm_year += 100; /* assume we are in 1970...2069 */ + tm->tm_year += 100; return rtc_valid_tm(tm); } @@ -101,6 +96,9 @@ static int pcf85063_set_datetime(struct i2c_client *client, struct rtc_time *tm) int rc; u8 regs[8]; + if ((tm->tm_year < 100) || (tm->tm_year > 199)) + return -EINVAL; + /* * to accurately set the time, reset the divider chain and keep it in * reset state until all time/date registers are written @@ -125,7 +123,7 @@ static int pcf85063_set_datetime(struct i2c_client *client, struct rtc_time *tm) regs[5] = bin2bcd(tm->tm_mon + 1); /* year and century */ - regs[6] = bin2bcd(tm->tm_year % 100); + regs[6] = bin2bcd(tm->tm_year - 100); /* * after all time/date registers are written, let the 'address auto |