diff options
| author | Daniel Rosenberg <drosen@google.com> | 2018-07-20 16:11:40 -0700 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2018-10-04 10:15:10 -0700 |
| commit | d68cebbbd97a644cd2733f40fb43dfa4cbc3b939 (patch) | |
| tree | 6167a382dd506a5ab9b6269e98f791412d6826a7 | |
| parent | 1fc8d3a43b561b28dc288b25b8c428354e0e1280 (diff) | |
ANDROID: sdcardfs: Change current->fs under lockASB-2018-10-05_3.18-o-mr1
bug: 111641492
Change-Id: I79e9894f94880048edaf0f7cfa2d180f65cbcf3b
Reported-by: Jann Horn <jannh@google.com>
Signed-off-by: Daniel Rosenberg <drosen@google.com>
| -rw-r--r-- | fs/sdcardfs/inode.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/sdcardfs/inode.c b/fs/sdcardfs/inode.c index 381ee3cd7d2f..b5fd31e6ac52 100644 --- a/fs/sdcardfs/inode.c +++ b/fs/sdcardfs/inode.c @@ -92,8 +92,11 @@ static int sdcardfs_create(struct inode *dir, struct dentry *dentry, err = -ENOMEM; goto out_unlock; } + copied_fs->umask = 0; + task_lock(current); current->fs = copied_fs; - current->fs->umask = 0; + task_unlock(current); + err = vfs_create2(lower_dentry_mnt, lower_parent_dentry->d_inode, lower_dentry, mode, want_excl); if (err) goto out; @@ -107,7 +110,9 @@ static int sdcardfs_create(struct inode *dir, struct dentry *dentry, fixup_lower_ownership(dentry, dentry->d_name.name); out: + task_lock(current); current->fs = saved_fs; + task_unlock(current); free_fs_struct(copied_fs); out_unlock: unlock_dir(lower_parent_dentry); @@ -241,8 +246,11 @@ static int sdcardfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode unlock_dir(lower_parent_dentry); goto out_unlock; } + copied_fs->umask = 0; + task_lock(current); current->fs = copied_fs; - current->fs->umask = 0; + task_unlock(current); + err = vfs_mkdir2(lower_mnt, lower_parent_dentry->d_inode, lower_dentry, mode); if (err) { @@ -310,7 +318,10 @@ static int sdcardfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode } } out: + task_lock(current); current->fs = saved_fs; + task_unlock(current); + free_fs_struct(copied_fs); out_unlock: sdcardfs_put_lower_path(dentry, &lower_path); |