Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1293878 > unrolled thread
| Started by | LABBE Corentin <clabbe.montjoie@gmail.com> |
|---|---|
| First post | 2015-12-17 14:20 +0100 |
| Last post | 2015-12-22 20:10 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 1/1] rtc: Replace simple_strtoul by kstrtoul LABBE Corentin <clabbe.montjoie@gmail.com> - 2015-12-17 14:20 +0100
Re: [PATCH v2 1/1] rtc: Replace simple_strtoul by kstrtoul Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-12-17 14:40 +0100
Re: [PATCH v2 1/1] rtc: Replace simple_strtoul by kstrtoul Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-12-22 20:10 +0100
| From | LABBE Corentin <clabbe.montjoie@gmail.com> |
|---|---|
| Date | 2015-12-17 14:20 +0100 |
| Subject | [PATCH v2 1/1] rtc: Replace simple_strtoul by kstrtoul |
| Message-ID | <qGGDo-8kx-17@gated-at.bofh.it> |
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>
---
drivers/rtc/rtc-sysfs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 7273855..463e286 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;
}
--
2.4.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Alexandre Belloni <alexandre.belloni@free-electrons.com> |
|---|---|
| Date | 2015-12-17 14:40 +0100 |
| Message-ID | <qGGWJ-8qU-9@gated-at.bofh.it> |
| In reply to | #1293878 |
On 17/12/2015 at 14:11:04 +0100, LABBE Corentin wrote :
> 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
>
Yeah, that is exactly the issue. Existing script that are doing that and
are currently working will then fail which is usually not what we want.
However, I think I'll still apply that patch.
> Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
> ---
> drivers/rtc/rtc-sysfs.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
> index 7273855..463e286 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;
> }
> --
> 2.4.10
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Alexandre Belloni <alexandre.belloni@free-electrons.com> |
|---|---|
| Date | 2015-12-22 20:10 +0100 |
| Message-ID | <qIAtQ-7UX-17@gated-at.bofh.it> |
| In reply to | #1293878 |
On 17/12/2015 at 14:11:04 +0100, LABBE Corentin wrote : > 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> > --- > drivers/rtc/rtc-sysfs.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > Applied, thanks. -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web