aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-09-25 03:02:51 -0400
committerOhad Ben-Cohen <ohad@wizery.com>2012-09-30 05:41:48 -0400
commitae768d5fac18cd4b3ff51a4860b89fabba8ccc65 (patch)
treefb880925b8a1b8e2fc3a4dbf61e90281a4a36ebe
parentec4d02d9180f407c41f8310a13b34e473c671fbb (diff)
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 <dan.carpenter@oracle.com> Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
-rw-r--r--drivers/remoteproc/remoteproc_debugfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c
index 10a38258e31d..ea90a5643db3 100644
--- a/drivers/remoteproc/remoteproc_debugfs.c
+++ b/drivers/remoteproc/remoteproc_debugfs.c
@@ -82,7 +82,7 @@ static ssize_t rproc_state_read(struct file *filp, char __user *userbuf,
82 82
83 state = rproc->state > RPROC_LAST ? RPROC_LAST : rproc->state; 83 state = rproc->state > RPROC_LAST ? RPROC_LAST : rproc->state;
84 84
85 i = snprintf(buf, 30, "%.28s (%d)\n", rproc_state_string[state], 85 i = scnprintf(buf, 30, "%.28s (%d)\n", rproc_state_string[state],
86 rproc->state); 86 rproc->state);
87 87
88 return simple_read_from_buffer(userbuf, count, ppos, buf, i); 88 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,
103 char buf[100]; 103 char buf[100];
104 int i; 104 int i;
105 105
106 i = snprintf(buf, sizeof(buf), "%.98s\n", rproc->name); 106 i = scnprintf(buf, sizeof(buf), "%.98s\n", rproc->name);
107 107
108 return simple_read_from_buffer(userbuf, count, ppos, buf, i); 108 return simple_read_from_buffer(userbuf, count, ppos, buf, i);
109} 109}