Commit b54c64f7 authored by David Howells's avatar David Howells Committed by Al Viro

hypfs: Fix error number left in struct pointer member

In hypfs_fill_super(), if hypfs_create_update_file() fails,
sbi->update_file is left holding an error number.  This is passed to
hypfs_kill_super() which doesn't check for this.

Fix this by not setting sbi->update_value until after we've checked for
error.

Fixes: 24bbb1fa ("[PATCH] s390_hypfs filesystem")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
cc: Heiko Carstens <heiko.carstens@de.ibm.com>
cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent dec90f61
...@@ -269,7 +269,7 @@ static int hypfs_show_options(struct seq_file *s, struct dentry *root) ...@@ -269,7 +269,7 @@ static int hypfs_show_options(struct seq_file *s, struct dentry *root)
static int hypfs_fill_super(struct super_block *sb, void *data, int silent) static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
{ {
struct inode *root_inode; struct inode *root_inode;
struct dentry *root_dentry; struct dentry *root_dentry, *update_file;
int rc = 0; int rc = 0;
struct hypfs_sb_info *sbi; struct hypfs_sb_info *sbi;
...@@ -300,9 +300,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -300,9 +300,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
rc = hypfs_diag_create_files(root_dentry); rc = hypfs_diag_create_files(root_dentry);
if (rc) if (rc)
return rc; return rc;
sbi->update_file = hypfs_create_update_file(root_dentry); update_file = hypfs_create_update_file(root_dentry);
if (IS_ERR(sbi->update_file)) if (IS_ERR(update_file))
return PTR_ERR(sbi->update_file); return PTR_ERR(update_file);
sbi->update_file = update_file;
hypfs_update_update(sb); hypfs_update_update(sb);
pr_info("Hypervisor filesystem mounted\n"); pr_info("Hypervisor filesystem mounted\n");
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment