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

Commit 4fe4a4b7 authored Apr 11, 2018 by Daniel Rosenberg

ANDROID: sdcardfs: Check for private data earlier



When an sdcardfs dentry is destroyed, it may not yet
have its fsdata initialized. It must be checked before
we try to access the paths in its private data.

Additionally, when cleaning up the superblock after
a failure, we don't have our sb private data, so
check for that case.

Bug: 77923821
Change-Id: I89caf6e121ed86480b42024664453fe0031bbcf3
Signed-off-by: Daniel Rosenberg <drosen@google.com>

parent c590c578

fs/sdcardfs/dentry.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,8 @@ out:

		static void sdcardfs_d_release(struct dentry *dentry)
		{
		if (!dentry \|\| !dentry->d_fsdata)
		return;
		/* release and reset the lower paths */
		if (has_graft_path(dentry))
		sdcardfs_put_reset_orig_path(dentry);

fs/sdcardfs/lookup.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,6 @@ void sdcardfs_destroy_dentry_cache(void)

		void free_dentry_private_data(struct dentry *dentry)
		{
		if (!dentry \|\| !dentry->d_fsdata)
		return;
		kmem_cache_free(sdcardfs_dentry_cachep, dentry->d_fsdata);
		dentry->d_fsdata = NULL;
		}

fs/sdcardfs/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ void sdcardfs_kill_sb(struct super_block *sb)
		{
		struct sdcardfs_sb_info *sbi;

		if (sb->s_magic == SDCARDFS_SUPER_MAGIC) {
		if (sb->s_magic == SDCARDFS_SUPER_MAGIC && sb->s_fs_info) {
		sbi = SDCARDFS_SB(sb);
		mutex_lock(&sdcardfs_super_list_lock);
		list_del(&sbi->list);