Skip to content

Commit f1e48d6

Browse files
Fix userspace GuestMaps (#55)
* Fix userspace GuestMaps * fix
1 parent fd6a2f3 commit f1e48d6

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

linux-user/syscall.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13679,20 +13679,16 @@ struct libafl_mapinfo {
1367913679
int flags, is_priv;
1368013680
};
1368113681
IntervalTreeNode * libafl_maps_first(IntervalTreeRoot * map_info);
13682-
IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinfo* ret, bool is_root);
13682+
IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinfo* ret);
1368313683

1368413684
IntervalTreeNode * libafl_maps_first(IntervalTreeRoot * map_info) {
1368513685
return interval_tree_iter_first(map_info, 0, -1);
1368613686
}
1368713687

13688-
IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinfo* ret, bool is_root) {
13688+
IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinfo* ret) {
1368913689
if (!node || !ret)
1369013690
return NULL;
1369113691

13692-
if (is_root) {
13693-
return libafl_maps_next(interval_tree_iter_next(node, 0, -1), ret, false);
13694-
}
13695-
1369613692
MapInfo *e = container_of(node, MapInfo, itree);
1369713693

1369813694
if (h2g_valid(e->itree.start)) {
@@ -13704,7 +13700,7 @@ IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinf
1370413700
max : (uintptr_t) g2h_untagged(GUEST_ADDR_MAX) + 1;
1370513701

1370613702
if (!page_check_range(h2g(min), max - min, flags)) {
13707-
return libafl_maps_next(interval_tree_iter_next(node, 0, -1), ret, false);
13703+
return libafl_maps_next(interval_tree_iter_next(node, 0, -1), ret);
1370813704
}
1370913705

1371013706
int libafl_flags = 0;
@@ -13721,7 +13717,7 @@ IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinf
1372113717

1372213718
return interval_tree_iter_next(node, 0, -1);
1372313719
} else {
13724-
return libafl_maps_next(interval_tree_iter_next(node, 0, -1), ret, false);
13720+
return libafl_maps_next(interval_tree_iter_next(node, 0, -1), ret);
1372513721
}
1372613722
}
1372713723

0 commit comments

Comments
 (0)