btrfs: Fix an error handling path in btrfs_rename()

[PATCH] btrfs: Fix an error handling path in btrfs_rename()

Posted by Christophe JAILLET 2 years, 9 months ago

If new_whiteout_inode() fails, some resources need to be freed.
Add the missing goto to the error handling path.

Fixes: ab3c5c18e8fa ("btrfs: setup qstr from dentrys using fscrypt helper")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 fs/btrfs/inode.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8bcad9940154..2ead7b1bdbaf 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9377,8 +9377,10 @@ static int btrfs_rename(struct user_namespace *mnt_userns,
 
 	if (flags & RENAME_WHITEOUT) {
 		whiteout_args.inode = new_whiteout_inode(mnt_userns, old_dir);
-		if (!whiteout_args.inode)
-			return -ENOMEM;
+		if (!whiteout_args.inode) {
+			ret = -ENOMEM;
+			goto out_fscrypt_names;
+		}
 		ret = btrfs_new_inode_prepare(&whiteout_args, &trans_num_items);
 		if (ret)
 			goto out_whiteout_inode;
-- 
2.34.1

Re: [PATCH] btrfs: Fix an error handling path in btrfs_rename()

Posted by David Sterba 2 years, 9 months ago

On Mon, Dec 12, 2022 at 09:14:17PM +0100, Christophe JAILLET wrote:
> If new_whiteout_inode() fails, some resources need to be freed.
> Add the missing goto to the error handling path.
> 
> Fixes: ab3c5c18e8fa ("btrfs: setup qstr from dentrys using fscrypt helper")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Added to misc-next, thanks.

Re: [PATCH] btrfs: Fix an error handling path in btrfs_rename()

Posted by Sweet Tea Dorminy 2 years, 9 months ago


On 12/12/22 15:14, Christophe JAILLET wrote:
> If new_whiteout_inode() fails, some resources need to be freed.
> Add the missing goto to the error handling path.
> 
> Fixes: ab3c5c18e8fa ("btrfs: setup qstr from dentrys using fscrypt helper")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>

Thanks for catching this.