btrfs-progs: fix wrong max system array size check in user space
authorGui Hecheng <guihc.fnst@cn.fujitsu.com>
Mon, 21 Apr 2014 12:13:31 +0000 (20:13 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 2 May 2014 15:04:09 +0000 (17:04 +0200)
For system chunk array,
We copy a "disk_key" and an chunk item each time,
so there should be enough space to hold both of them,
not only the chunk item.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
volumes.c

index 77ffd32..b39f374 100644 (file)
--- a/volumes.c
+++ b/volumes.c
@@ -630,7 +630,8 @@ int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
        u8 *ptr;
 
        array_size = btrfs_super_sys_array_size(super_copy);
-       if (array_size + item_size > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE)
+       if (array_size + item_size + sizeof(disk_key)
+                       > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE)
                return -EFBIG;
 
        ptr = super_copy->sys_chunk_array + array_size;