Skip to content

Commit a476164

Browse files
sumeet4linuxUlrich Hecht
authored andcommitted
powercap: fix sscanf() error return value handling
[ Upstream commit efc4c35b741af973de90f6826bf35d3b3ac36bf1 ] Fix inconsistent error handling for sscanf() return value check. Implicit boolean conversion is used instead of explicit return value checks. The code checks if (!sscanf(...)) which is incorrect because: 1. sscanf returns the number of successfully parsed items 2. On success, it returns 1 (one item passed) 3. On failure, it returns 0 or EOF 4. The check 'if (!sscanf(...))' is wrong because it treats success (1) as failure All occurrences of sscanf() now uses explicit return value check. With this behavior it returns '-EINVAL' when parsing fails (returns 0 or EOF), and continues when parsing succeeds (returns 1). Signed-off-by: Sumeet Pawnikar <sumeet4linux@gmail.com> [ rjw: Subject and changelog edits ] Link: https://patch.msgid.link/20251207151549.202452-1-sumeet4linux@gmail.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent ae9bc49 commit a476164

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/powercap/powercap_sys.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static ssize_t show_constraint_##_attr(struct device *dev, \
7979
int id; \
8080
struct powercap_zone_constraint *pconst;\
8181
\
82-
if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id)) \
82+
if (sscanf(dev_attr->attr.name, "constraint_%d_", &id) != 1) \
8383
return -EINVAL; \
8484
if (id >= power_zone->const_id_cnt) \
8585
return -EINVAL; \
@@ -104,7 +104,7 @@ static ssize_t store_constraint_##_attr(struct device *dev,\
104104
int id; \
105105
struct powercap_zone_constraint *pconst;\
106106
\
107-
if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id)) \
107+
if (sscanf(dev_attr->attr.name, "constraint_%d_", &id) != 1) \
108108
return -EINVAL; \
109109
if (id >= power_zone->const_id_cnt) \
110110
return -EINVAL; \
@@ -173,7 +173,7 @@ static ssize_t show_constraint_name(struct device *dev,
173173
ssize_t len = -ENODATA;
174174
struct powercap_zone_constraint *pconst;
175175

176-
if (!sscanf(dev_attr->attr.name, "constraint_%d_", &id))
176+
if (sscanf(dev_attr->attr.name, "constraint_%d_", &id) != 1)
177177
return -EINVAL;
178178
if (id >= power_zone->const_id_cnt)
179179
return -EINVAL;

0 commit comments

Comments
 (0)