lkml.org 
[lkml]   [2018]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 116/145] ubifs: Fix directory size calculation for symlinks
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Richard Weinberger <richard@nod.at>

    commit 00ee8b60102862f4daf0814d12a2ea2744fc0b9b upstream.

    We have to account the name of the symlink and not the target length.

    Fixes: ca7f85be8d6c ("ubifs: Add support for encrypted symlinks")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ubifs/dir.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/fs/ubifs/dir.c
    +++ b/fs/ubifs/dir.c
    @@ -1123,8 +1123,7 @@ static int ubifs_symlink(struct inode *d
    struct ubifs_inode *ui;
    struct ubifs_inode *dir_ui = ubifs_inode(dir);
    struct ubifs_info *c = dir->i_sb->s_fs_info;
    - int err, len = strlen(symname);
    - int sz_change = CALC_DENT_SIZE(len);
    + int err, sz_change, len = strlen(symname);
    struct fscrypt_str disk_link;
    struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
    .new_ino_d = ALIGN(len, 8),
    @@ -1151,6 +1150,8 @@ static int ubifs_symlink(struct inode *d
    if (err)
    goto out_budg;

    + sz_change = CALC_DENT_SIZE(fname_len(&nm));
    +
    inode = ubifs_new_inode(c, dir, S_IFLNK | S_IRWXUGO);
    if (IS_ERR(inode)) {
    err = PTR_ERR(inode);

    \
     
     \ /
      Last update: 2018-09-07 23:21    [W:4.043 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site