diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-02-12 20:51:05 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-02-12 21:43:09 -0500 |
| commit | a437f5fc84d4d1308771245f8a65035ac56630f6 (patch) | |
| tree | 33bc7918c817a68457bbdb62f2d5f2af844ef3ab | |
| parent | c28f93bc52c5a9ffe89a43c2db562b2b371648e3 (diff) | |
Update bcachefs sources to 199bfbed8a lib/generic-radix-tree.c: Don't overflow in peek()
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/fsck.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index ee42a247..d5e5cda9 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -5e73602f6c2569e7b81b3ea658502ac9b546cb61 +199bfbed8a4ebda0ec5c5bd04c742218f2fca586 diff --git a/libbcachefs/fsck.c b/libbcachefs/fsck.c index c3f83960..b2d9d55b 100644 --- a/libbcachefs/fsck.c +++ b/libbcachefs/fsck.c @@ -1351,7 +1351,8 @@ static int bch2_gc_walk_inodes(struct bch_fs *c, nlinks_iter = genradix_iter_init(links, 0); while ((k = bch2_btree_iter_peek(iter)).k && - !(ret2 = bkey_err(k))) { + !(ret2 = bkey_err(k)) && + iter->pos.offset < range_end) { peek_nlinks: link = genradix_iter_peek(&nlinks_iter, links); if (!link && (!k.k || iter->pos.offset >= range_end)) |