diff options
| author | Richard Weinberger <richard@nod.at> | 2016-09-29 21:00:38 +0300 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2016-12-13 01:07:38 +0300 |
| commit | ac7e47a9ed1b22b1c71345fcdec35a5d2727ef2c (patch) | |
| tree | ffa8f90b4ce1941a5391905198ced19275502db4 /fs/ubifs | |
| parent | a79bff21c120a615dc8ba6df9258e9e2ef022e3b (diff) | |
| download | linux-ac7e47a9ed1b22b1c71345fcdec35a5d2727ef2c.tar.xz | |
ubifs: Enforce crypto policy in ->link and ->rename
When a file is moved or linked into another directory
its current crypto policy has to be compatible with the
target policy.
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/dir.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 477817567971..bd0af4e9ca0b 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -639,6 +639,10 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, ubifs_assert(inode_is_locked(dir)); ubifs_assert(inode_is_locked(inode)); + if (ubifs_crypt_is_encrypted(dir) && + !fscrypt_has_permitted_context(dir, inode)) + return -EPERM; + err = dbg_check_synced_i_size(c, inode); if (err) return err; @@ -1133,6 +1137,12 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlink) ubifs_assert(inode_is_locked(new_inode)); + if (old_dir != new_dir) { + if (ubifs_crypt_is_encrypted(new_dir) && + !fscrypt_has_permitted_context(new_dir, old_inode)) + return -EPERM; + } + if (unlink && is_dir) { err = ubifs_check_dir_empty(new_inode); if (err) @@ -1327,6 +1337,13 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, ubifs_assert(fst_inode && snd_inode); + if ((ubifs_crypt_is_encrypted(old_dir) || + ubifs_crypt_is_encrypted(new_dir)) && + (old_dir != new_dir) && + (!fscrypt_has_permitted_context(new_dir, fst_inode) || + !fscrypt_has_permitted_context(old_dir, snd_inode))) + return -EPERM; + lock_4_inodes(old_dir, new_dir, NULL, NULL); time = ubifs_current_time(old_dir); |