summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds2018-04-20 18:15:14 +0200
committerLinus Torvalds2018-04-20 18:15:14 +0200
commitb9abdcfd10f12c174c7118aa68244db1d8a3c9a6 (patch)
tree61dbf61a4af25bbbe261a9b5d43e80143a64ee85 /arch/s390
parentMerge tag 'ecryptfs-4.17-rc2-fixes' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentDon't leak MNT_INTERNAL away from internal mounts (diff)
downloadkernel-qcow2-linux-b9abdcfd10f12c174c7118aa68244db1d8a3c9a6.tar.gz
kernel-qcow2-linux-b9abdcfd10f12c174c7118aa68244db1d8a3c9a6.tar.xz
kernel-qcow2-linux-b9abdcfd10f12c174c7118aa68244db1d8a3c9a6.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Assorted fixes. Some of that is only a matter with fault injection (broken handling of small allocation failure in various mount-related places), but the last one is a root-triggerable stack overflow, and combined with userns it gets really nasty ;-/" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: Don't leak MNT_INTERNAL away from internal mounts mm,vmscan: Allow preallocating memory for register_shrinker(). rpc_pipefs: fix double-dput() orangefs_kill_sb(): deal with allocation failures jffs2_kill_sb(): deal with failed allocations hypfs_kill_super(): deal with failed allocations
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/hypfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 43bbe63e2992..06b513d192b9 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -320,7 +320,7 @@ static void hypfs_kill_super(struct super_block *sb)
if (sb->s_root)
hypfs_delete_tree(sb->s_root);
- if (sb_info->update_file)
+ if (sb_info && sb_info->update_file)
hypfs_remove(sb_info->update_file);
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;