Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62260dfc authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

f2fs: don't leak filename in f2fs_try_convert_inline_dir() 



We need to call fscrypt_free_filename() to free the memory allocated by
fscrypt_setup_filename().

Fixes: b06af2aff28b ("f2fs: convert inline_dir early before starting rename")
Cc: <stable@vger.kernel.org> # v5.6+
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 833a1932

fs/f2fs/inline.c

+4 −2
Original line number Diff line number Diff line
@@ -559,12 +559,12 @@ int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry) 
	ipage = f2fs_get_node_page(sbi, dir->i_ino);

	if (IS_ERR(ipage)) {

		err = PTR_ERR(ipage);

		goto out;

		goto out_fname;

	}



	if (f2fs_has_enough_room(dir, ipage, &fname)) {

		f2fs_put_page(ipage, 1);

		goto out;

		goto out_fname;

	}



	inline_dentry = inline_data_addr(dir, ipage);
@@ -572,6 +572,8 @@ int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry) 
	err = do_convert_inline_dir(dir, ipage, inline_dentry);

	if (!err)

		f2fs_put_page(ipage, 1);

out_fname:

	fscrypt_free_filename(&fname);

out:

	f2fs_unlock_op(sbi);

	return err;