This is a note to let you know that I've just added the patch titled btrfs: fix possible memory leak in btrfs_get_dev_args_from_path() to the 5.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: btrfs-fix-possible-memory-leak-in-btrfs_get_dev_args_from_path.patch and it can be found in the queue-5.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 9ea0106a7a3d8116860712e3f17cd52ce99f6707 Mon Sep 17 00:00:00 2001 From: Zixuan Fu <r33s3n6@xxxxxxxxx> Date: Mon, 15 Aug 2022 23:16:06 +0800 Subject: btrfs: fix possible memory leak in btrfs_get_dev_args_from_path() From: Zixuan Fu <r33s3n6@xxxxxxxxx> commit 9ea0106a7a3d8116860712e3f17cd52ce99f6707 upstream. In btrfs_get_dev_args_from_path(), btrfs_get_bdev_and_sb() can fail if the path is invalid. In this case, btrfs_get_dev_args_from_path() returns directly without freeing args->uuid and args->fsid allocated before, which causes memory leak. To fix these possible leaks, when btrfs_get_bdev_and_sb() fails, btrfs_put_dev_args_from_path() is called to clean up the memory. Reported-by: TOTE Robot <oslab@xxxxxxxxxxxxxxx> Fixes: faa775c41d655 ("btrfs: add a btrfs_get_dev_args_from_path helper") CC: stable@xxxxxxxxxxxxxxx # 5.16 Reviewed-by: Boris Burkov <boris@xxxxxx> Signed-off-by: Zixuan Fu <r33s3n6@xxxxxxxxx> Reviewed-by: David Sterba <dsterba@xxxxxxxx> Signed-off-by: David Sterba <dsterba@xxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/btrfs/volumes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2344,8 +2344,11 @@ int btrfs_get_dev_args_from_path(struct ret = btrfs_get_bdev_and_sb(path, FMODE_READ, fs_info->bdev_holder, 0, &bdev, &disk_super); - if (ret) + if (ret) { + btrfs_put_dev_args_from_path(args); return ret; + } + args->devid = btrfs_stack_device_id(&disk_super->dev_item); memcpy(args->uuid, disk_super->dev_item.uuid, BTRFS_UUID_SIZE); if (btrfs_fs_incompat(fs_info, METADATA_UUID)) Patches currently in stable-queue which might be from r33s3n6@xxxxxxxxx are queue-5.19/btrfs-fix-possible-memory-leak-in-btrfs_get_dev_args_from_path.patch