diff options
| author | LABBE Corentin <clabbe.montjoie@gmail.com> | 2015-12-17 14:11:04 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-01-11 20:20:02 +0100 |
| commit | f571287bda5390751ab4e4d5e3f54fa2d1788667 (patch) | |
| tree | 7941eef4b3153930cfbddb1486086e8057c4d74a /drivers/rtc/rtc-sysfs.c | |
| parent | 718a820a303ca60645ab703451ecfebf045c896b (diff) | |
| download | lwn-f571287bda5390751ab4e4d5e3f54fa2d1788667.tar.gz lwn-f571287bda5390751ab4e4d5e3f54fa2d1788667.zip | |
rtc: Replace simple_strtoul by kstrtoul
The simple_strtoul function is obsolete.
This patch replace it by kstrtoul.
Since kstrtoul is more strict, it permits to filter some invalid input that
simple_strtoul accept. For example:
echo '1022xxx' > /sys/devices/pnp0/00:03/rtc/rtc0/max_user_freq
cat /sys/devices/pnp0/00:03/rtc/rtc0/max_user_freq
1022
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-sysfs.c')
| -rw-r--r-- | drivers/rtc/rtc-sysfs.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index 7273855ed02e..463e286064ab 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c @@ -91,7 +91,12 @@ max_user_freq_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) { struct rtc_device *rtc = to_rtc_device(dev); - unsigned long val = simple_strtoul(buf, NULL, 0); + unsigned long val; + int err; + + err = kstrtoul(buf, 0, &val); + if (err) + return err; if (val >= 4096 || val == 0) return -EINVAL; @@ -175,7 +180,9 @@ wakealarm_store(struct device *dev, struct device_attribute *attr, } else adjust = 1; } - alarm = simple_strtoul(buf_ptr, NULL, 0); + retval = kstrtoul(buf_ptr, 0, &alarm); + if (retval) + return retval; if (adjust) { alarm += now; } |