evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: sdcardfs: ->iget fixes

Browse source 
Adapted from wrapfs
commit 8c49eaa0sb9c ("Wrapfs: ->iget fixes")

Change where we igrab/iput to ensure we always hold a valid lower_inode.
Return ENOMEM (not EACCES) if iget5_locked returns NULL.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35766959

Change-Id: Id8d4e0c0cbc685a0a77685ce73c923e9a3ddc094
This commit is contained in:
Daniel Rosenberg 2017-04-18 12:45:48 -07:00
parent d657201d48
commit 6f28e6ebcc
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs/sdcardfs/lookup.c
View file

@ -91,7 +91,9 @@ struct inode *sdcardfs_iget(struct super_block *sb, struct inode *lower_inode, u
struct sdcardfs_inode_info *info; struct sdcardfs_inode_info *info;
struct inode_data data; struct inode_data data;
struct inode *inode; /* the new inode to return */ struct inode *inode; /* the new inode to return */
int err;
if (!igrab(lower_inode))
return ERR_PTR(-ESTALE);
data.id = id; data.id = id;
data.lower_inode = lower_inode; data.lower_inode = lower_inode;
@ -106,22 +108,19 @@ struct inode *sdcardfs_iget(struct super_block *sb, struct inode *lower_inode, u
sdcardfs_inode_set, /* inode init function */ sdcardfs_inode_set, /* inode init function */
&data); /* data passed to test+set fxns */ &data); /* data passed to test+set fxns */
if (!inode) { if (!inode) {
err = -EACCES;
iput(lower_inode); iput(lower_inode);
return ERR_PTR(err); return ERR_PTR(-ENOMEM);
} }
/* if found a cached inode, then just return it */ /* if found a cached inode, then just return it (after iput) */
if (!(inode->i_state & I_NEW)) if (!(inode->i_state & I_NEW)) {
iput(lower_inode);
return inode; return inode;
}
/* initialize new inode */ /* initialize new inode */
info = SDCARDFS_I(inode); info = SDCARDFS_I(inode);
inode->i_ino = lower_inode->i_ino; inode->i_ino = lower_inode->i_ino;
if (!igrab(lower_inode)) {
err = -ESTALE;
return ERR_PTR(err);
}
sdcardfs_set_lower_inode(inode, lower_inode); sdcardfs_set_lower_inode(inode, lower_inode);
inode->i_version++; inode->i_version++;