ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

seq_file: always clear m->count when we free m->buf

Browse Source 
Once we'd freed m->buf, m->count should become zero - we have no valid
contents reachable via m->buf.

Reported-by: Charley (Hao Chuan) Chu <charley.chu@broadcom.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2013-11-19 01:20:43 +00:00
committed by Linus Torvalds
parent 27b5c3f3cc
commit 801a76050b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/seq_file.c
View File

@@ -136,6 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
Eoverflow: Eoverflow:
m->op->stop(m, p); m->op->stop(m, p);
kfree(m->buf); kfree(m->buf);
m->count = 0;
m->buf = kmalloc(m->size <<= 1, GFP_KERNEL); m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
return !m->buf ? -ENOMEM : -EAGAIN; return !m->buf ? -ENOMEM : -EAGAIN;
} }
@@ -232,10 +233,10 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
goto Fill; goto Fill;
m->op->stop(m, p); m->op->stop(m, p);
kfree(m->buf); kfree(m->buf);
m->count = 0;
m->buf = kmalloc(m->size <<= 1, GFP_KERNEL); m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
if (!m->buf) if (!m->buf)
goto Enomem; goto Enomem;
m->count = 0;
m->version = 0; m->version = 0;
pos = m->index; pos = m->index;
p = m->op->start(m, &pos); p = m->op->start(m, &pos);