summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2017-03-10 13:54:30 -0800
committerDaniel Rosenberg <drosen@google.com>2017-03-14 14:53:49 -0700
commit1a736af098a35e3eb42b28f92384cc18e47200bf (patch)
tree2ec7ebe9b7d2beef1f143958df584581d5c004f8
parent8dbb44c8aa4a47430b42500c3e8a482121162024 (diff)
ANDROID: sdcardfs: move path_put outside of spinlock
Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 35643557 Change-Id: Ib279ebd7dd4e5884d184d67696a93e34993bc1ef
-rw-r--r--fs/sdcardfs/derived_perm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/sdcardfs/derived_perm.c b/fs/sdcardfs/derived_perm.c
index 4b365b95b437..dba58d8c9d60 100644
--- a/fs/sdcardfs/derived_perm.c
+++ b/fs/sdcardfs/derived_perm.c
@@ -357,6 +357,8 @@ int is_obbpath_invalid(struct dentry *dent)
struct sdcardfs_dentry_info *di = SDCARDFS_D(dent);
struct sdcardfs_sb_info *sbi = SDCARDFS_SB(dent->d_sb);
char *path_buf, *obbpath_s;
+ int need_put = 0;
+ struct path lower_path;
/* check the base obbpath has been changed.
* this routine can check an uninitialized obb dentry as well.
@@ -383,10 +385,13 @@ int is_obbpath_invalid(struct dentry *dent)
}
//unlock_dir(lower_parent);
- path_put(&di->lower_path);
+ pathcpy(&lower_path, &di->lower_path);
+ need_put = 1;
}
}
spin_unlock(&di->lock);
+ if (need_put)
+ path_put(&lower_path);
return ret;
}