diff options
| author | Daniel Rosenberg <drosen@google.com> | 2017-06-07 12:44:50 -0700 |
|---|---|---|
| committer | Daniel Rosenberg <drosen@google.com> | 2017-06-07 13:51:22 -0700 |
| commit | 4fd2931f74468752711044528129e1155bde82fd (patch) | |
| tree | 23c685ff78dbb630673b84e45b90ed27b6078d1a | |
| parent | 6fc0573f6daffb79bb6ea76daea17b99a3c4526a (diff) | |
ANDROID: sdcardfs: d_splice_alias can return error values
We must check that d_splice_alias was successful before using its
output.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 62390017
Change-Id: Ifda0a052fb3f67e35c635a4e5e907876c5400978
| -rw-r--r-- | fs/sdcardfs/lookup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/sdcardfs/lookup.c b/fs/sdcardfs/lookup.c index 00ae21151f52..676e394e07be 100644 --- a/fs/sdcardfs/lookup.c +++ b/fs/sdcardfs/lookup.c @@ -199,7 +199,8 @@ static struct dentry *__sdcardfs_interpose(struct dentry *dentry, ret_dentry = d_splice_alias(inode, dentry); dentry = ret_dentry ?: dentry; - update_derived_permission_lock(dentry); + if (!IS_ERR(dentry)) + update_derived_permission_lock(dentry); out: return ret_dentry; } |