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

fscrypto: lock inode while setting encryption policy

Browse source 
am: 3a19419c50

Change-Id: I3926f8d43c5d7f4c3648460bc103f24d05b6f3ee
This commit is contained in:
Eric Biggers 2017-03-22 11:32:11 +00:00 • committed by android-build-merger
commit 2bc9e957b2
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/ext4/ioctl.c
View file

@ -637,8 +637,12 @@ resizefs_out:
if (err) if (err)
goto encryption_policy_out; goto encryption_policy_out;
mutex_lock(&inode->i_mutex);
err = ext4_process_policy(&policy, inode); err = ext4_process_policy(&policy, inode);
mutex_unlock(&inode->i_mutex);
mnt_drop_write_file(filp); mnt_drop_write_file(filp);
encryption_policy_out: encryption_policy_out:
return err; return err;

9
fs/f2fs/file.c
View file

@ -1535,12 +1535,19 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
#ifdef CONFIG_F2FS_FS_ENCRYPTION #ifdef CONFIG_F2FS_FS_ENCRYPTION
struct f2fs_encryption_policy policy; struct f2fs_encryption_policy policy;
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
int err;
if (copy_from_user(&policy, (struct f2fs_encryption_policy __user *)arg, if (copy_from_user(&policy, (struct f2fs_encryption_policy __user *)arg,
sizeof(policy))) sizeof(policy)))
return -EFAULT; return -EFAULT;
return f2fs_process_policy(&policy, inode); mutex_lock(&inode->i_mutex);
err = f2fs_process_policy(&policy, inode);
mutex_unlock(&inode->i_mutex);
return err;
#else #else
return -EOPNOTSUPP; return -EOPNOTSUPP;
#endif #endif