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

Commit 56303ade authored by Richard Weinberger's avatar Richard Weinberger Committed by Greg Kroah-Hartman
Browse files

ubifs: Fix directory size calculation for symlinks 



commit 00ee8b60102862f4daf0814d12a2ea2744fc0b9b upstream

We have to account the name of the symlink and not the target length.

Fixes: ca7f85be ("ubifs: Add support for encrypted symlinks")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2e598102

fs/ubifs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -1147,8 +1147,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, 
	struct ubifs_inode *ui;

	struct ubifs_inode *dir_ui = ubifs_inode(dir);

	struct ubifs_info *c = dir->i_sb->s_fs_info;

	int err, len = strlen(symname);

	int sz_change = CALC_DENT_SIZE(len);

	int err, sz_change, len = strlen(symname);

	struct fscrypt_str disk_link = FSTR_INIT((char *)symname, len + 1);

	struct fscrypt_symlink_data *sd = NULL;

	struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
@@ -1189,6 +1188,8 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, 
	if (err)

		goto out_budg;



	sz_change = CALC_DENT_SIZE(fname_len(&nm));



	inode = ubifs_new_inode(c, dir, S_IFLNK | S_IRWXUGO);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);