[PATCH 4.4 135/210] vfs: show_vfsstat: do not ignore errors from show_devname method
From: Greg Kroah-Hartman
Date: Sun Apr 10 2016 - 15:51:32 EST
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/proc_namespace.c | 2 ++
1 file changed, 2 insertions(+)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -197,6 +197,8 @@ static int show_vfsstat(struct seq_file
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 ");