diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2015-03-19 11:10:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:08:55 -0700 |
| commit | 994f9db39113a268394fcba06537cabfbb40cb2b (patch) | |
| tree | ea49f4efdde224397ec1a7df7609d3a9f9911b3a /fs/proc_namespace.c | |
| parent | da191fac4bfa7ba6372e10365591a2759a3298ea (diff) | |
vfs: show_vfsstat: do not ignore errors from show_devname method
commit 5f8d498d4364f544fee17125787a47553db02afa upstream.
Explicitly check show_devname method return code and bail out in case
of an error. This fixes regression introduced by commit 9d4d65748a5c.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/proc_namespace.c')
| -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 8ebd9a334085..87645955990d 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -197,6 +197,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 "); |