diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-20 09:15:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-20 09:15:14 -0700 |
| commit | b9abdcfd10f12c174c7118aa68244db1d8a3c9a6 (patch) | |
| tree | 61dbf61a4af25bbbe261a9b5d43e80143a64ee85 /arch | |
| parent | 43f70c960180c11d64ee3e9e53075fe1acd43ff1 (diff) | |
| parent | 16a34adb9392b2fe4195267475ab5b472e55292c (diff) | |
| download | linux-b9abdcfd10f12c174c7118aa68244db1d8a3c9a6.tar.bz2 | |
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')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 2 |
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; |