remoteproc: snprintf() can return more than was printed

PATCH Applied Dan Carpenter 2 participants 2 messages Sep 25, 2012 – Sep 30, 2012

Subsystems (2)

Kernel janitors Remote processor (remoteproc)

lore

Share & tools

lore

Dan Carpenter

author

2012-09-25 07:02 UTC #0 lore raw

PATCH 2/3 remoteproc: snprintf() can return more than was printed

snprintf() returns the number of characters which would have been printed if there were enough space. For example, on the first print if we fill up the 28 character string then it would return a number more than 30. Use scnprintf() instead because that returns the actual number of characters printed.

Signed-off-by Dan Carpenter <[email protected]>

drivers/remoteproc/remoteproc_debugfs.c +2 -2

index 10a3825..ea90a56 100644
@@ -82,7 +82,7 @@ static ssize_t rproc_state_read(struct file *filp, char __user *userbuf,
 
 	state = rproc->state > RPROC_LAST ? RPROC_LAST : rproc->state;
 
-	i = snprintf(buf, 30, "%.28s (%d)\n", rproc_state_string[state],
+	i = scnprintf(buf, 30, "%.28s (%d)\n", rproc_state_string[state],
 							rproc->state);
 
 	return simple_read_from_buffer(userbuf, count, ppos, buf, i);

@@ -103,7 +103,7 @@ static ssize_t rproc_name_read(struct file *filp, char __user *userbuf,
 	char buf[100];
 	int i;
 
-	i = snprintf(buf, sizeof(buf), "%.98s\n", rproc->name);
+	i = scnprintf(buf, sizeof(buf), "%.98s\n", rproc->name);
 
 	return simple_read_from_buffer(userbuf, count, ppos, buf, i);
 }

Ohad Ben-Cohen

Applied

2012-09-30 09:40 UTC #1 lore raw

Quoted 7 lines · Dan Carpenter

snprintf() returns the number of characters which would have been printed if there were enough space. For example, on the first print if we fill up the 28 character string then it would return a number more than 30. Use scnprintf() instead because that returns the actual number of characters printed.
Signed-off-by Dan Carpenter <[email protected]>

Applied, thanks.