clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-08 06:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various allocator bugfixes (#128)

Browse Source 
* Fix off-by-one in test_vma_overlap()

* Fix calloc crash when underlying malloc fails

* Use `bool` where possible

* Fix C-string null-termination in __set_comment
This commit is contained in:
Michał Kowalczyk
2017-12-05 16:33:45 +00:00
committed by Don Porter
parent 529a4ba3cb
commit e781b047ea
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/shim/src/bookkeep/shim_vma.c
+11 -11
View File
@@ -77,40 +77,39 @@ DEFINE_LISTP(shim_vma);
static LISTP_TYPE(shim_vma) vma_list = LISTP_INIT;
static LOCKTYPE vma_list_lock;
static inline int test_vma_equal (struct shim_vma * tmp,
static inline bool test_vma_equal (struct shim_vma * tmp,
const void * addr, uint64_t length)
{
return tmp->addr == addr &&
tmp->addr + tmp->length == addr + length;
return tmp->addr == addr && tmp->length == length;
}
static inline int test_vma_contain (struct shim_vma * tmp,
static inline bool test_vma_contain (struct shim_vma * tmp,
const void * addr, uint64_t length)
{
return tmp->addr <= addr &&
tmp->addr + tmp->length >= addr + length;
}
static inline int test_vma_startin (struct shim_vma * tmp,
static inline bool test_vma_startin (struct shim_vma * tmp,
const void * addr, uint64_t length)
{
return tmp->addr >= addr &&
tmp->addr < addr + length;
}
static inline int test_vma_endin (struct shim_vma * tmp,
static inline bool test_vma_endin (struct shim_vma * tmp,
const void * addr, uint64_t length)
{
return tmp->addr + tmp->length > addr &&
tmp->addr + tmp->length <= addr + length;
}
static inline int test_vma_overlap (struct shim_vma * tmp,
static inline bool test_vma_overlap (struct shim_vma * tmp,
const void * addr, uint64_t length)
{
return test_vma_contain (tmp, addr + 1, 0) ||
test_vma_contain (tmp, addr + length - 1, 0) ||
test_vma_startin (tmp, addr, length - 1);
return test_vma_contain(tmp, addr, 1) ||
test_vma_contain(tmp, addr + length - 1, 1) ||
test_vma_startin(tmp, addr, length);
}
int bkeep_shim_heap (void);
@@ -274,7 +273,8 @@ static inline void __set_comment (struct shim_vma * vma, const char * comment)
if (len > VMA_COMMENT_LEN - 1)
len = VMA_COMMENT_LEN - 1;
memcpy(vma->comment, comment, len + 1);
memcpy(vma->comment, comment, len);
vma->comment[len] = 0;
}
static int __bkeep_mmap (void * addr, uint64_t length,
LibOS/shim/src/shim_malloc.c
+2 -1
View File
@@ -330,7 +330,8 @@ void * calloc (size_t nmemb, size_t size)
{
size_t total = nmemb * size;
void *ptr = malloc(total);
memset(ptr, 0, total);
if (ptr)
memset(ptr, 0, total);
return ptr;
}
extern_alias(calloc);