2014-12-16 08:51:48

by Rastislav Barlik

Subject: [PATCH] samples/kobject: Use kstrtoint instead of sscanf

Use kstrtoint function instead of sscanf and check for return values.

Signed-off-by: Rastislav Barlik <[email protected]>
---
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

2014-12-19 01:39:11

by Rusty Russell

Subject: Re: [PATCH] samples/kobject: Use kstrtoint instead of sscanf

Rastislav Barlik <[email protected]> writes:
> Use kstrtoint function instead of sscanf and check for return values.
>
> Signed-off-by: Rastislav Barlik <[email protected]>

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

2014-12-19 01:56:35

by Greg Kroah-Hartman

Subject: Re: [PATCH] samples/kobject: Use kstrtoint instead of sscanf

On Fri, Dec 19, 2014 at 11:27:37AM +1030, Rusty Russell wrote:
> Rastislav Barlik <[email protected]> writes:
> > Use kstrtoint function instead of sscanf and check for return values.
> >
> > Signed-off-by: Rastislav Barlik <[email protected]>
>
> 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]

Thanks, I'll fix that up after 3.19-rc1 is out.

greg k-h