alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-10 00:00:24 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

generix radix trees: Don't overflow in peek()

Browse Source
This commit is contained in:
Kent Overstreet 2021-02-12 20:12:43 -05:00
parent 868abec1ab
commit c28f93bc52
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/generic-radix-tree.h
View File

@ -183,6 +183,14 @@ void *__genradix_iter_peek(struct genradix_iter *, struct __genradix *, size_t);
static inline void __genradix_iter_advance(struct genradix_iter *iter, static inline void __genradix_iter_advance(struct genradix_iter *iter,
size_t obj_size) size_t obj_size)
{ {
size_t new_offset = iter->offset + obj_size;
if (new_offset < iter->offset) {
iter->offset = SIZE_MAX;
iter->pos = SIZE_MAX;
return;
}
iter->offset += obj_size; iter->offset += obj_size;
if (!is_power_of_2(obj_size) && if (!is_power_of_2(obj_size) &&

17
linux/generic-radix-tree.c
View File

@ -147,6 +147,10 @@ void *__genradix_iter_peek(struct genradix_iter *iter,
struct genradix_root *r; struct genradix_root *r;
struct genradix_node *n; struct genradix_node *n;
unsigned level, i; unsigned level, i;
if (iter->offset == SIZE_MAX)
return NULL;
restart: restart:
r = READ_ONCE(radix->root); r = READ_ONCE(radix->root);
if (!r) if (!r)
@ -165,10 +169,17 @@ restart:
(GENRADIX_ARY - 1); (GENRADIX_ARY - 1);
while (!n->children[i]) { while (!n->children[i]) {
size_t objs_per_ptr = genradix_depth_size(level);
if (iter->offset + objs_per_ptr < iter->offset) {
iter->offset = SIZE_MAX;
iter->pos = SIZE_MAX;
return NULL;
}
i++; i++;
iter->offset = round_down(iter->offset + iter->offset = round_down(iter->offset + objs_per_ptr,
genradix_depth_size(level), objs_per_ptr);
genradix_depth_size(level));
iter->pos = (iter->offset >> PAGE_SHIFT) * iter->pos = (iter->offset >> PAGE_SHIFT) *
objs_per_page; objs_per_page;
if (i == GENRADIX_ARY) if (i == GENRADIX_ARY)