Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9abdcfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 43f70c96 16a34adb

arch/s390/hypfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/jffs2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static void jffs2_put_super (struct super_block *sb) 
static void jffs2_kill_sb(struct super_block *sb)

{

	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);

	if (!sb_rdonly(sb))

	if (c && !sb_rdonly(sb))

		jffs2_stop_garbage_collect_thread(c);

	kill_mtd_super(sb);

	kfree(c);

fs/namespace.c

+2 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,8 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root, 
			goto out_free;

	}



	mnt->mnt.mnt_flags = old->mnt.mnt_flags & ~(MNT_WRITE_HOLD|MNT_MARKED);

	mnt->mnt.mnt_flags = old->mnt.mnt_flags;

	mnt->mnt.mnt_flags &= ~(MNT_WRITE_HOLD|MNT_MARKED|MNT_INTERNAL);

	/* Don't allow unprivileged users to change mount flags */

	if (flag & CL_UNPRIVILEGED) {

		mnt->mnt.mnt_flags |= MNT_LOCK_ATIME;

fs/orangefs/super.c

+5 −0
Original line number Diff line number Diff line
@@ -579,6 +579,11 @@ void orangefs_kill_sb(struct super_block *sb) 
	/* provided sb cleanup */

	kill_anon_super(sb);



	if (!ORANGEFS_SB(sb)) {

		mutex_lock(&orangefs_request_mutex);

		mutex_unlock(&orangefs_request_mutex);

		return;

	}

	/*

	 * issue the unmount to userspace to tell it to remove the

	 * dynamic mount info it has for this superblock

fs/super.c

+4 −5
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static void destroy_unused_super(struct super_block *s) 
	security_sb_free(s);

	put_user_ns(s->s_user_ns);

	kfree(s->s_subtype);

	free_prealloced_shrinker(&s->s_shrink);

	/* no delays needed */

	destroy_super_work(&s->destroy_work);

}
@@ -252,6 +253,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags, 
	s->s_shrink.count_objects = super_cache_count;

	s->s_shrink.batch = 1024;

	s->s_shrink.flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE;

	if (prealloc_shrinker(&s->s_shrink))

		goto fail;

	return s;



fail:
@@ -518,11 +521,7 @@ struct super_block *sget_userns(struct file_system_type *type, 
	hlist_add_head(&s->s_instances, &type->fs_supers);

	spin_unlock(&sb_lock);

	get_filesystem(type);

	err = register_shrinker(&s->s_shrink);

	if (err) {

		deactivate_locked_super(s);

		s = ERR_PTR(err);

	}

	register_shrinker_prepared(&s->s_shrink);

	return s;

}