diff options
| author | Michael Holzheu <holzheu@de.ibm.com> | 2006-09-20 16:00:04 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-09-20 16:00:04 +0200 |
| commit | 388c571cffc4ae4e64f0786333e811308acbbc10 (patch) | |
| tree | 98bfa69fe8fa4cae331ccfa46118e40d1e80d389 /arch/s390 | |
| parent | 564337f34cc10fd8f30329e4e5f14f8995db5711 (diff) | |
| download | kernel_samsung_aries-388c571cffc4ae4e64f0786333e811308acbbc10.zip kernel_samsung_aries-388c571cffc4ae4e64f0786333e811308acbbc10.tar.gz kernel_samsung_aries-388c571cffc4ae4e64f0786333e811308acbbc10.tar.bz2 | |
[S390] hypfs crashes with invalid mount option.
When an invalid mount option is specified, no root inode is created
for hypfs, hypfs_fill_super() returns with -EINVAL and then
hypfs_kill_super() is called. hypfs_kill_super() does not check if
the root inode has been initialized. This patch adds this check.
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index bdcad2e..bdade5f 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -312,10 +312,12 @@ static void hypfs_kill_super(struct super_block *sb) { struct hypfs_sb_info *sb_info = sb->s_fs_info; - hypfs_delete_tree(sb->s_root); - hypfs_remove(sb_info->update_file); - kfree(sb->s_fs_info); - sb->s_fs_info = NULL; + if (sb->s_root) { + hypfs_delete_tree(sb->s_root); + hypfs_remove(sb_info->update_file); + kfree(sb->s_fs_info); + sb->s_fs_info = NULL; + } kill_litter_super(sb); } |