lkml.org 
[lkml]   [2014]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] samples/kobject: Use kstrtoint instead of sscanf
Date
Rastislav Barlik <barlik@zoho.com> writes:
> Use kstrtoint function instead of sscanf and check for return values.
>
> Signed-off-by: Rastislav Barlik <barlik@zoho.com>

Hmm, this seems like Greg, not me.

Greg, I noticed this in samples/kobject/kobject-example.c:

* Released under the GPL version 2 only.
...
MODULE_LICENSE("GPL");

From module.h:

* The following license idents are currently accepted as indicating free
* software modules
*
* "GPL" [GNU Public License v2 or later]
* "GPL v2" [GNU Public License v2]

Cheers,
Rusty.

> ---
> samples/kobject/kobject-example.c | 14 +++++++++++---
> samples/kobject/kset-example.c | 14 +++++++++++---
> 2 files changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/samples/kobject/kobject-example.c b/samples/kobject/kobject-example.c
> index 01562e0..063aaec 100644
> --- a/samples/kobject/kobject-example.c
> +++ b/samples/kobject/kobject-example.c
> @@ -36,7 +36,12 @@ static ssize_t foo_show(struct kobject *kobj, struct kobj_attribute *attr,
> static ssize_t foo_store(struct kobject *kobj, struct kobj_attribute *attr,
> const char *buf, size_t count)
> {
> - sscanf(buf, "%du", &foo);
> + int ret;
> +
> + ret = kstrtoint(buf, 10, &foo);
> + if (ret < 0)
> + return ret;
> +
> return count;
> }
>
> @@ -63,9 +68,12 @@ static ssize_t b_show(struct kobject *kobj, struct kobj_attribute *attr,
> static ssize_t b_store(struct kobject *kobj, struct kobj_attribute *attr,
> const char *buf, size_t count)
> {
> - int var;
> + int var, ret;
> +
> + ret = kstrtoint(buf, 10, &var);
> + if (ret < 0)
> + return ret;
>
> - sscanf(buf, "%du", &var);
> if (strcmp(attr->attr.name, "baz") == 0)
> baz = var;
> else
> diff --git a/samples/kobject/kset-example.c b/samples/kobject/kset-example.c
> index ab5e447..e80ced3 100644
> --- a/samples/kobject/kset-example.c
> +++ b/samples/kobject/kset-example.c
> @@ -120,7 +120,12 @@ static ssize_t foo_show(struct foo_obj *foo_obj, struct foo_attribute *attr,
> static ssize_t foo_store(struct foo_obj *foo_obj, struct foo_attribute *attr,
> const char *buf, size_t count)
> {
> - sscanf(buf, "%du", &foo_obj->foo);
> + int ret;
> +
> + ret = kstrtoint(buf, 10, &foo_obj->foo);
> + if (ret < 0)
> + return ret;
> +
> return count;
> }
>
> @@ -147,9 +152,12 @@ static ssize_t b_show(struct foo_obj *foo_obj, struct foo_attribute *attr,
> static ssize_t b_store(struct foo_obj *foo_obj, struct foo_attribute *attr,
> const char *buf, size_t count)
> {
> - int var;
> + int var, ret;
> +
> + ret = kstrtoint(buf, 10, &var);
> + if (ret < 0)
> + return ret;
>
> - sscanf(buf, "%du", &var);
> if (strcmp(attr->attr.name, "baz") == 0)
> foo_obj->baz = var;
> else
> --
> 2.1.3


\
 
 \ /
  Last update: 2014-12-19 03:21    [W:0.033 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site