ext4: fix memory leaks in ext4_fname_{setup_filename,prepare_lookup}
PATCH 1/1 ext4: fix memory leaks in ext4_fname_{setup_filename,prepare_lookup}
From: Luís Henriques <[email protected]>
[ Upstream commit 7ca4b085f430f3774c3838b3da569ceccd6a0177 ]
If the filename casefolding fails, we'll be leaking memory from the fscrypt_name struct, namely from the 'crypto_buf.name' member.
Make sure we free it in the error path on both ext4_fname_setup_filename() and ext4_fname_prepare_lookup() functions.
Fixes 1ae98e295fa2 ("ext4: optimize match for casefolded encrypted dirs")
Signed-off-by Luís Henriques <[email protected]>
Reviewed-by Eric Biggers <[email protected]>
Signed-off-by Theodore Ts'o <[email protected]>
[ fs/ext4/crypto.c was removed by commit
a7550b30ab70 ("ext4 crypto: migrate into vfs's crypto engine") since v4.8, so apply this patch to fs/ext4/ext4.h in v5.15. Move ext4_fname_free_filename() to the front of ext4_fname_setup_filename() to fix a build issue. ]
Signed-off-by Bin Lan <[email protected]>
--- fs/ext4/ext4.h | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-)
fs/ext4/ext4.h +21 -17
@@ -2749,6 +2749,23 @@ static inline void ext4_fname_from_fscrypt_name(struct ext4_filename *dst, dst->crypto_buf = src->crypto_buf; } +static inline void ext4_fname_free_filename (struct ext4_filename *fname) +{ +struct fscrypt_name name; + + name.crypto_buf = fname->crypto_buf; +fscrypt_free_filename (&name); + + fname->crypto_buf.name =NULL ; + fname->usr_fname =NULL ; + fname->disk_name.name =NULL ; + +#ifdef CONFIG_UNICODE +kfree (fname->cf_name.name); + fname->cf_name.name =NULL ; +#endif +} + static inline int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname, int lookup,
@@ -2765,6 +2782,8 @@ static inline int ext4_fname_setup_filename(struct inode *dir,#ifdef CONFIG_UNICODE err =ext4_fname_setup_ci_filename (dir, iname, fname); +if (err) +ext4_fname_free_filename (fname);#endif return err; }
@@ -2784,26 +2803,11 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir,#ifdef CONFIG_UNICODE err =ext4_fname_setup_ci_filename (dir, &dentry->d_name, fname); +if (err) +ext4_fname_free_filename (fname);#endif return err; } - -static inline void ext4_fname_free_filename (struct ext4_filename *fname) -{ -struct fscrypt_name name; - - name.crypto_buf = fname->crypto_buf; -fscrypt_free_filename (&name); - - fname->crypto_buf.name =NULL ; - fname->usr_fname =NULL ; - fname->disk_name.name =NULL ; - -#ifdef CONFIG_UNICODE -kfree (fname->cf_name.name); - fname->cf_name.name =NULL ; -#endif -}#else /* !CONFIG_FS_ENCRYPTION */ static inline int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname,
Signature · 1 line
2.43.0