fs: Check return value of ->show_devname
Jan Kara
reviewerPATCH 1/1 fs: Check return value of ->show_devname
show_vfsstat() isn't checking the return value of ->show_devname(). Check it and bail out properly.
Coverity-id: 1260113
Signed-off-by Jan Kara <[email protected]>
--- fs/proc_namespace.c | 2 ++ 1 file changed, 2 insertions(+)
fs/proc_namespace.c +2 -0
@@ -195,6 +195,8 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)if (sb->s_op->show_devname) {seq_puts (m,"device " ); err = sb->s_op->show_devname (m, mnt_path.dentry); +if (err) + goto out; }else {if (r->mnt_devname) {seq_puts (m,"device " );
Signature · 1 line
2.1.2
Jan Kara
reviewerPATCH 1/1 seq_file: Remove pointless assignment in seq_read()
The value assigned to 'err' in seq_read() is overwritten by the result of copy_to_user(). This is correct because we know we have succeeded to generate at least one entry into user buffer so the error we got when generating further entries is irrelevant. Just remove the assignment.
Coverity-id: 1226981
Signed-off-by Jan Kara <[email protected]>
--- fs/seq_file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/seq_file.c +1 -3
@@ -255,10 +255,8 @@ Fill:size_t offs = m->count;loff_t next = pos; p = m->op->next (m, p, &next); -if (!p ||IS_ERR (p)) { - err =PTR_ERR (p); +if (!p ||IS_ERR (p))break ; - } err = m->op->show (m, p);if (seq_has_overflowed (m) || err) { m->count = offs;
Signature · 1 line
2.1.2