iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples/kobject: Use kstrtoint instead of sscanf

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

Signed-off-by: Rastislav Barlik <barlik@zoho.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rastislav Barlik 2014-12-17 21:14:48 +01:00 committed by Greg Kroah-Hartman
parent 1c34203a14
commit 5fd637e7a7
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/kobject/kobject-example.c
View File

@ -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, static ssize_t foo_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
sscanf(buf, "%du", &foo); int ret;
ret = kstrtoint(buf, 10, &foo);
if (ret < 0)
return ret;
return count; 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, static ssize_t b_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t count) 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) if (strcmp(attr->attr.name, "baz") == 0)
baz = var; baz = var;
else else

14
samples/kobject/kset-example.c
View File

@ -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, static ssize_t foo_store(struct foo_obj *foo_obj, struct foo_attribute *attr,
const char *buf, size_t count) 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; 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, static ssize_t b_store(struct foo_obj *foo_obj, struct foo_attribute *attr,
const char *buf, size_t count) 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) if (strcmp(attr->attr.name, "baz") == 0)
foo_obj->baz = var; foo_obj->baz = var;
else else