btrfs: filter invalid arg for btrfs resize
authorGui Hecheng <guihc.fnst@cn.fujitsu.com>
Mon, 31 Mar 2014 10:03:25 +0000 (18:03 +0800)
committerChris Mason <clm@fb.com>
Mon, 7 Apr 2014 16:08:45 +0000 (09:08 -0700)
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: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ioctl.c

index 59622366c613dcd0a5099fb83eb6b02c55a50530..05f8df866e4cf6075b638b572bae31af9e5943a4 100644 (file)
@@ -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;
                }