UCS/GTEST: fixed uninitialized value access

openucx · May 30, 2024 · 6070dd4 · 6070dd4
1 parent bb67c18
commit 6070dd4
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/ucs/memory/rcache.c b/src/ucs/memory/rcache.c
@@ -830,11 +830,7 @@ ucs_rcache_check_overlap_one(ucs_rcache_t *rcache, ucs_pgt_addr_t *start,
     return UCS_OK;
 }
 
-/* Lock must be held
- * Old ASAN versions reports buffer underflow false-positive during access to
- * `region` through `ucs_list_link_t` entry. Newer ASAN versions don't
- * report this issue (e.g. standard ASAN on Ubuntu 22.04).
- */
+/* Lock must be held */
 static ucs_status_t UCS_F_NO_SANITIZE_ADDRESS
 ucs_rcache_check_overlap(ucs_rcache_t *rcache, void *arg, ucs_pgt_addr_t *start,
                          ucs_pgt_addr_t *end, size_t *alignment, int *prot,
@@ -855,14 +851,16 @@ ucs_rcache_check_overlap(ucs_rcache_t *rcache, void *arg, ucs_pgt_addr_t *start,
     ucs_list_head_init(&region_list);
     ucs_rcache_find_regions(rcache, *start, *end - 1, &region_list);
 
-    region = ucs_list_next(&region_list, ucs_rcache_region_t, tmp_list);
-    if (ucs_list_is_only(&region_list, &region->tmp_list) &&
-        (*start >= region->super.start) && (*end <= region->super.end) &&
-        ucs_rcache_region_test(region, *prot, *alignment)) {
-        /* Found a region which contains the given address range */
-        ucs_rcache_region_hold(rcache, region);
-        *region_p = region;
-        return UCS_ERR_ALREADY_EXISTS;
+    if (!ucs_list_is_empty(&region_list)) {
+        region = ucs_list_next(&region_list, ucs_rcache_region_t, tmp_list);
+        if (ucs_list_is_only(&region_list, &region->tmp_list) &&
+            (*start >= region->super.start) && (*end <= region->super.end) &&
+            ucs_rcache_region_test(region, *prot, *alignment)) {
+            /* Found a region which contains the given address range */
+            ucs_rcache_region_hold(rcache, region);
+            *region_p = region;
+            return UCS_ERR_ALREADY_EXISTS;
+        }
     }
 
     /* TODO check if any of the regions is locked */