Browse Source

fs/proc/array.c: set overflow flag in case of error

For now in task_name() we ignore the return code of string_escape_str()
call.  This is not good if buffer suddenly becomes not big enough.  Do the
proper error handling there.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andy Shevchenko 9 years ago
parent
commit
3a49f3d2a1
1 changed files with 5 additions and 5 deletions
  1. 5 5
      fs/proc/array.c

+ 5 - 5
fs/proc/array.c

@@ -91,18 +91,18 @@
 static inline void task_name(struct seq_file *m, struct task_struct *p)
 static inline void task_name(struct seq_file *m, struct task_struct *p)
 {
 {
 	char *buf;
 	char *buf;
+	size_t size;
 	char tcomm[sizeof(p->comm)];
 	char tcomm[sizeof(p->comm)];
+	int ret;
 
 
 	get_task_comm(tcomm, p);
 	get_task_comm(tcomm, p);
 
 
 	seq_puts(m, "Name:\t");
 	seq_puts(m, "Name:\t");
-	buf = m->buf + m->count;
 
 
-	/* Ignore error for now */
-	buf += string_escape_str(tcomm, buf, m->size - m->count,
-				 ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+	size = seq_get_buf(m, &buf);
+	ret = string_escape_str(tcomm, buf, size, ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+	seq_commit(m, ret < size ? ret : -1);
 
 
-	m->count = buf - m->buf;
 	seq_putc(m, '\n');
 	seq_putc(m, '\n');
 }
 }