lkml.org 
[lkml]   [2017]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 104/105] f2fs: dont allow encrypted operations without keys
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jaegeuk Kim <jaegeuk@kernel.org>

    commit 363fa4e078cbdc97a172c19d19dc04b41b52ebc8 upstream.

    This patch fixes the renaming bug on encrypted filenames, which was pointed by

    (ext4: don't allow encrypted operations without keys)

    Cc: Theodore Ts'o <tytso@mit.edu>
    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/f2fs/namei.c | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    --- a/fs/f2fs/namei.c
    +++ b/fs/f2fs/namei.c
    @@ -663,6 +663,12 @@ static int f2fs_rename(struct inode *old
    bool is_old_inline = f2fs_has_inline_dentry(old_dir);
    int err = -ENOENT;

    + if ((f2fs_encrypted_inode(old_dir) &&
    + !fscrypt_has_encryption_key(old_dir)) ||
    + (f2fs_encrypted_inode(new_dir) &&
    + !fscrypt_has_encryption_key(new_dir)))
    + return -ENOKEY;
    +
    if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) &&
    !fscrypt_has_permitted_context(new_dir, old_inode)) {
    err = -EPERM;
    @@ -843,6 +849,12 @@ static int f2fs_cross_rename(struct inod
    int old_nlink = 0, new_nlink = 0;
    int err = -ENOENT;

    + if ((f2fs_encrypted_inode(old_dir) &&
    + !fscrypt_has_encryption_key(old_dir)) ||
    + (f2fs_encrypted_inode(new_dir) &&
    + !fscrypt_has_encryption_key(new_dir)))
    + return -ENOKEY;
    +
    if ((f2fs_encrypted_inode(old_dir) || f2fs_encrypted_inode(new_dir)) &&
    (old_dir != new_dir) &&
    (!fscrypt_has_permitted_context(new_dir, old_inode) ||

    \
     
     \ /
      Last update: 2017-10-10 21:59    [W:3.456 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site