summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2016-09-15 20:13:13 +0300
committerTheodore Ts'o <tytso@mit.edu>2016-09-15 20:13:13 +0300
commitdcce7a46c6f28f41447272fb44348ead8f584573 (patch)
treea0fca1ac41b755d420516d759f88cb11a7cfdfdf /fs/ext4
parentf0c9fd5458bacf7b12a9a579a727dc740cbe047e (diff)
downloadlinux-dcce7a46c6f28f41447272fb44348ead8f584573.tar.xz
ext4: fix memory leak when symlink decryption fails
This bug was introduced in v4.8-rc1. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/symlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
index 4d83d9e05f2e..04a7850a0d45 100644
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@ -65,13 +65,12 @@ static const char *ext4_encrypted_get_link(struct dentry *dentry,
res = fscrypt_fname_alloc_buffer(inode, cstr.len, &pstr);
if (res)
goto errout;
+ paddr = pstr.name;
res = fscrypt_fname_disk_to_usr(inode, 0, 0, &cstr, &pstr);
if (res < 0)
goto errout;
- paddr = pstr.name;
-
/* Null-terminate the name */
if (res <= pstr.len)
paddr[res] = '\0';