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

Commit 0df2f982 authored by Daniel Roseberg's avatar Daniel Roseberg Committed by Daniel Rosenberg
Browse files

ANDROID: sdcardfs: Don't iput if we didn't igrab 



If we fail to get top, top is either NULL, or igrab found
that we're in the process of freeing that inode, and did
not grab it. Either way, we didn't grab it, and have no
business putting it.

Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Bug: 38117720
Change-Id: Ie2f587483b9abb5144263156a443e89bc69b767b
parent 6bf837d9

fs/sdcardfs/inode.c

+2 −7
Original line number Diff line number Diff line
@@ -622,11 +622,8 @@ static int sdcardfs_permission(struct vfsmount *mnt, struct inode *inode, int ma 
	struct inode tmp;

	struct inode *top = grab_top(SDCARDFS_I(inode));



	if (!top) {

		release_top(SDCARDFS_I(inode));

		WARN(1, "Top value was null!\n");

	if (!top)

		return -EINVAL;

	}



	/*

	 * Permission check on sdcardfs inode.
@@ -701,10 +698,8 @@ static int sdcardfs_setattr(struct vfsmount *mnt, struct dentry *dentry, struct 
	inode = d_inode(dentry);

	top = grab_top(SDCARDFS_I(inode));



	if (!top) {

		release_top(SDCARDFS_I(inode));

	if (!top)

		return -EINVAL;

	}



	/*

	 * Permission check on sdcardfs inode.