Skip to content

Commit

Permalink
Input: atmel_mxt_ts - use scnprintf for object sysfs entry
Browse files Browse the repository at this point in the history
Using scnprintf() is a cleaner way to ensure that we don't overwrite the
PAGE_SIZE sysfs output buffer.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
  • Loading branch information
Daniel Kurtz authored and Henrik Rydberg committed Jun 29, 2012
1 parent 55d6867 commit 9c67b78
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/input/touchscreen/atmel_mxt_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -904,17 +904,13 @@ static ssize_t mxt_object_show(struct device *dev,
for (i = 0; i < data->info.object_num; i++) {
object = data->object_table + i;

count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"Object[%d] (Type %d)\n",
i + 1, object->type);
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;

if (!mxt_object_readable(object->type)) {
count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"\n");
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
continue;
}

Expand All @@ -924,15 +920,11 @@ static ssize_t mxt_object_show(struct device *dev,
if (error)
return error;

count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"\t[%2d]: %02x (%d)\n", j, val, val);
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
}

count += snprintf(buf + count, PAGE_SIZE - count, "\n");
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
count += scnprintf(buf + count, PAGE_SIZE - count, "\n");
}

return count;
Expand Down

0 comments on commit 9c67b78

Please sign in to comment.