lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] deal with the first call of ->show() generating no output

Browse Source 
seq_read() has a subtle bug - we want the first loop there to go
until at least one *non-empty* record had fit entirely into buffer.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2008-08-24 07:45:33 -04:00
parent 59af1584bf
commit 4cdfe84b51
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/seq_file.c
View File

@@ -108,9 +108,9 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
goto Done; goto Done;
} }
/* we need at least one record in buffer */ /* we need at least one record in buffer */
while (1) {
pos = m->index; pos = m->index;
p = m->op->start(m, &pos); p = m->op->start(m, &pos);
while (1) {
err = PTR_ERR(p); err = PTR_ERR(p);
if (!p || IS_ERR(p)) if (!p || IS_ERR(p))
break; break;
@@ -119,6 +119,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
break; break;
if (unlikely(err)) if (unlikely(err))
m->count = 0; m->count = 0;
if (unlikely(!m->count)) {
p = m->op->next(m, p, &pos);
m->index = pos;
continue;
}
if (m->count < m->size) if (m->count < m->size)
goto Fill; goto Fill;
m->op->stop(m, p); m->op->stop(m, p);
@@ -128,6 +133,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
goto Enomem; goto Enomem;
m->count = 0; m->count = 0;
m->version = 0; m->version = 0;
pos = m->index;
p = m->op->start(m, &pos);
} }
m->op->stop(m, p); m->op->stop(m, p);
m->count = 0; m->count = 0;