Patch "ubifs: free the encrypted symlink target" has been added to the 4.15-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ubifs: free the encrypted symlink target
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ubifs-free-the-encrypted-symlink-target.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6b46d444146eb8d0b99562795cea8086639d7282Mon Sep 17 00:00:00 2001
From: Eric Biggers <[email protected]>
Date: Thu, 11 Jan 2018 23:27:00 -0500
Subject: ubifs: free the encrypted symlink target
From: Eric Biggers <[email protected]>
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.)
--- fs/ubifs/dir.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/ubifs/dir.c +4 -6
@@ -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; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/ubifs-free-the-encrypted-symlink-target.patch queue-4.15/nfs-reject-request-for-id_legacy-key-without-auxdata.patch