lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 095/202] ubifs: free the encrypted symlink target
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Biggers <ebiggers@google.com>

    commit 6b46d444146eb8d0b99562795cea8086639d7282 upstream.

    ubifs_symlink() forgot to free the kmalloc()'ed buffer holding the
    encrypted symlink target, creating a memory leak. Fix it.

    (UBIFS could actually encrypt directly into ui->data, removing the
    temporary buffer, but that is left for the patch that switches to use
    the symlink helper functions.)

    Fixes: ca7f85be8d6c ("ubifs: Add support for encrypted symlinks")
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ubifs/dir.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/fs/ubifs/dir.c
    +++ b/fs/ubifs/dir.c
    @@ -1216,10 +1216,8 @@ static int ubifs_symlink(struct inode *d
    ostr.len = disk_link.len;

    err = fscrypt_fname_usr_to_disk(inode, &istr, &ostr);
    - if (err) {
    - kfree(sd);
    + if (err)
    goto out_inode;
    - }

    sd->len = cpu_to_le16(ostr.len);
    disk_link.name = (char *)sd;
    @@ -1251,11 +1249,10 @@ static int ubifs_symlink(struct inode *d
    goto out_cancel;
    mutex_unlock(&dir_ui->ui_mutex);

    - ubifs_release_budget(c, &req);
    insert_inode_hash(inode);
    d_instantiate(dentry, inode);
    - fscrypt_free_filename(&nm);
    - return 0;
    + err = 0;
    + goto out_fname;

    out_cancel:
    dir->i_size -= sz_change;
    @@ -1268,6 +1265,7 @@ out_fname:
    fscrypt_free_filename(&nm);
    out_budg:
    ubifs_release_budget(c, &req);
    + kfree(sd);
    return err;
    }


    \
     
     \ /
      Last update: 2018-02-15 17:27    [W:4.169 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site