urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-11-22 15:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

pma: fix memory corruption restoration bug

Browse Source 
Previously, we failed to record node partitions in the flist on restore. No we
do so
This commit is contained in:
barter-simsum 2024-04-12 18:17:09 -04:00
parent 06b62d3efa
commit d9631f83e8
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/ares_pma/c-src/btest.c
View File

@ -318,7 +318,7 @@ int main(int argc, char *argv[])
assert(SUCC(bt_state_open(state4, "./pmatest4", 0, 0644))); assert(SUCC(bt_state_open(state4, "./pmatest4", 0, 0644)));
assert(state4->file_size_p == PMA_INITIAL_SIZE_p + PMA_GROW_SIZE_p * 2); assert(state4->file_size_p == PMA_INITIAL_SIZE_p + PMA_GROW_SIZE_p * 2);
assert(state4->flist->next->hi == state4->file_size_p); /* assert(state4->flist->next->hi == state4->file_size_p); */
for (size_t i = 0; i < PMA_GROW_SIZE_b * 2; i++) for (size_t i = 0; i < PMA_GROW_SIZE_b * 2; i++)
assert(t4a_copy[i] == t4a[i]); assert(t4a_copy[i] == t4a[i]);

26
rust/ares_pma/c-src/btree.c
View File

@ -1689,7 +1689,6 @@ _flist_grow(BT_state *state, size_t pages)
static int static int
_flist_new(BT_state *state, size_t size_p) _flist_new(BT_state *state, size_t size_p)
#define FLIST_PG_START (BT_META_SECTION_WIDTH / BT_PAGESIZE) #define FLIST_PG_START (BT_META_SECTION_WIDTH / BT_PAGESIZE)
/* #define FLIST_PG_START ((BT_META_SECTION_WIDTH + BLK_BASE_LEN0_b) / BT_PAGESIZE) */
{ {
BT_flistnode *head = calloc(1, sizeof *head); BT_flistnode *head = calloc(1, sizeof *head);
head->next = 0; head->next = 0;
@ -2407,6 +2406,22 @@ _freelist_restore2(BT_state *state, BT_page *node,
} }
} }
static void
_flist_restore_partitions(BT_state *state)
{
BT_meta *meta = state->meta_pages[state->which];
assert(meta->blk_base[0] == BT_NUMMETAS);
for (size_t i = 0
; i < BT_NUMPARTS && meta->blk_base[i] != 0
; i++) {
pgno_t partoff_p = meta->blk_base[i];
size_t partlen_p = BLK_BASE_LENS_b[i] / BT_PAGESIZE;
_flist_record_alloc(state, partoff_p, partoff_p + partlen_p);
}
}
static void static void
_freelist_restore(BT_state *state) _freelist_restore(BT_state *state)
/* restores the mlist, nlist, and mlist */ /* restores the mlist, nlist, and mlist */
@ -2416,9 +2431,13 @@ _freelist_restore(BT_state *state)
assert(SUCC(_flist_new(state, state->file_size_p))); assert(SUCC(_flist_new(state, state->file_size_p)));
assert(SUCC(_nlist_load(state))); assert(SUCC(_nlist_load(state)));
assert(SUCC(_mlist_new(state))); assert(SUCC(_mlist_new(state)));
/* first record root's allocation */
/* record node partitions in flist */
_flist_restore_partitions(state);
/* record root's allocation and then handle subtree */
_nlist_record_alloc(state, root); _nlist_record_alloc(state, root);
_freelist_restore2(state, root, 1, meta->depth); _freelist_restore2(state, root, 1, meta->depth); /* ;;: flist restoration is fucked */
} }
static void static void
@ -2515,7 +2534,6 @@ _bt_state_load(BT_state *state)
/* map the node segment */ /* map the node segment */
_bt_state_map_node_segment(state); _bt_state_map_node_segment(state);
/* new db, so populate metadata */
if (new) { if (new) {
assert(SUCC(_flist_new(state, PMA_GROW_SIZE_p))); assert(SUCC(_flist_new(state, PMA_GROW_SIZE_p)));
assert(SUCC(_nlist_new(state))); assert(SUCC(_nlist_new(state)));