The keys returned by tree search ioctl should be restricted to:
key.objectid = [min_objectid, max_objectid] &&
key.offset = [min_offset, max_offset] &&
key.type = [min_type, max_type]
But actually it returns those keys:
[(min_objectid, min_type, min_offset),
(max_objectid, max_type, max_offset)].
And the bug can result in missing subvolumes in the output of
"btrfs subvolume list"
Reported-by: Ian! D. Allen <idallen@xxxxxxxxxx>
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
---
fs/btrfs/ioctl.c | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index f1c9bb4..785f713 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1028,23 +1028,11 @@ out:
static noinline int key_in_sk(struct btrfs_key *key,
struct btrfs_ioctl_search_key *sk)
{
- struct btrfs_key test;
- int ret;
-
- test.objectid = sk->min_objectid;
- test.type = sk->min_type;
- test.offset = sk->min_offset;
-
- ret = btrfs_comp_cpu_keys(key, &test);
- if (ret < 0)
+ if (key->type < sk->min_type || key->type > sk->max_type)
return 0;
-
- test.objectid = sk->max_objectid;
- test.type = sk->max_type;
- test.offset = sk->max_offset;
-
- ret = btrfs_comp_cpu_keys(key, &test);
- if (ret > 0)
+ if (key->offset < sk->min_offset || key->offset > sk->max_offset)
+ return 0;
+ if (key->objectid < sk->min_objectid || key->objectid > sk->max_objectid)
return 0;
return 1;
}
--
1.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
