Unverified Commit ec333f44 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5977 btrfs: dev-replace: properly validate device names 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/73EE6R5IRIRJDPSENWSD4PFO4Y5KBDV7/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E469 
 
Link:https://gitee.com/openeuler/kernel/pulls/5977

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 07162dde 55fde3fc

fs/btrfs/dev-replace.c

+20 −4
Original line number Diff line number Diff line
@@ -566,6 +566,23 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, 
	return ret;

}



static int btrfs_check_replace_dev_names(struct btrfs_ioctl_dev_replace_args *args)

{

	if (args->start.srcdevid == 0) {

		if (memchr(args->start.srcdev_name, 0,

			   sizeof(args->start.srcdev_name)) == NULL)

			return -ENAMETOOLONG;

	} else {

		args->start.srcdev_name[0] = 0;

	}



	if (memchr(args->start.tgtdev_name, 0,

		   sizeof(args->start.tgtdev_name)) == NULL)

	    return -ENAMETOOLONG;



	return 0;

}



int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,

			    struct btrfs_ioctl_dev_replace_args *args)

{
@@ -578,10 +595,9 @@ int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info, 
	default:

		return -EINVAL;

	}



	if ((args->start.srcdevid == 0 && args->start.srcdev_name[0] == '\0') ||

	    args->start.tgtdev_name[0] == '\0')

		return -EINVAL;

	ret = btrfs_check_replace_dev_names(args);

	if (ret < 0)

		return ret;



	ret = btrfs_dev_replace_start(fs_info, args->start.tgtdev_name,

					args->start.srcdevid,