diff options
| author | Andy Shevchenko <[email protected]> | 2015-11-06 16:30:03 -0800 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-11-06 17:50:42 -0800 | 
| commit | 3a49f3d2a10dfb27411d321900197a3d6c52405b (patch) | |
| tree | 0f7073139fddf2dc6d1b1166a4d87458d3836ede /fs/proc/array.c | |
| parent | 1965c8b7ac7dd147663faf77a66a693ac3ddcb85 (diff) | |
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 <[email protected]>
Cc: Alexander Viro <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/fs/proc/array.c b/fs/proc/array.c index eed2050db9be..d73291f5f0fc 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -91,18 +91,18 @@  static inline void task_name(struct seq_file *m, struct task_struct *p)  {  	char *buf; +	size_t size;  	char tcomm[sizeof(p->comm)]; +	int ret;  	get_task_comm(tcomm, p);  	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');  } |