diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2015-03-19 11:10:54 +0000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-03-16 13:09:08 -0400 |
| commit | 5f8d498d4364f544fee17125787a47553db02afa (patch) | |
| tree | 470014f8c179847b339244db471f0351bd19889b | |
| parent | a5b3a80b899bda0f456f1246c4c5a1191ea01519 (diff) | |
vfs: show_vfsstat: do not ignore errors from show_devname method
Explicitly check show_devname method return code and bail out in case
of an error. This fixes regression introduced by commit 9d4d65748a5c.
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/proc_namespace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 2256e7e23e67..3f1190d18991 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -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 "); |