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

Commit 9a40f122 authored by Gui Hecheng's avatar Gui Hecheng Committed by Chris Mason
Browse files

btrfs: filter invalid arg for btrfs resize 



Originally following cmds will work:
	# btrfs fi resize -10A  <mnt>
	# btrfs fi resize -10Gaha <mnt>
Filter the arg by checking the return pointer of memparse.

Signed-off-by: default avatarGui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 766b5e5a

fs/btrfs/ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -1472,6 +1472,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, 
	struct btrfs_trans_handle *trans;

	struct btrfs_device *device = NULL;

	char *sizestr;

	char *retptr;

	char *devstr = NULL;

	int ret = 0;

	int mod = 0;
@@ -1539,8 +1540,8 @@ static noinline int btrfs_ioctl_resize(struct file *file, 
			mod = 1;

			sizestr++;

		}

		new_size = memparse(sizestr, NULL);

		if (new_size == 0) {

		new_size = memparse(sizestr, &retptr);

		if (*retptr != '\0' || new_size == 0) {

			ret = -EINVAL;

			goto out_free;

		}