Merge "seq_file: always clear m->count when we free m->buf" (ef2f20ba) · Commits · e / devices / android_kernel_sony_msm8994

fs/seq_file.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
		Eoverflow:
		m->op->stop(m, p);
		kfree(m->buf);
		m->count = 0;
		m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
		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;
		m->op->stop(m, p);
		kfree(m->buf);
		m->count = 0;
		m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
		if (!m->buf)
		goto Enomem;
		m->count = 0;
		m->version = 0;
		pos = m->index;
		p = m->op->start(m, &pos);