Skip to content

Commit

Permalink
vfs: show_vfsstat: do not ignore errors from show_devname method
Browse files Browse the repository at this point in the history
Explicitly check show_devname method return code and bail out in case
of an error.  This fixes regression introduced by commit 9d4d657.

Cc: stable@vger.kernel.org
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Dmitry V. Levin authored and Al Viro committed Mar 16, 2016
1 parent a5b3a80 commit 5f8d498
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/proc_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,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 ");
Expand Down

0 comments on commit 5f8d498

Please sign in to comment.