提交 2ad9cf52 编写于 作者: R Rich Felker

fix invalid read in aligned_alloc

in case of mmap-obtained chunks, end points past the end of the
mapping and reading it may fault. since the value is not needed until
after the conditional, move the access to prevent invalid reads.
上级 5c5e45e5
......@@ -31,8 +31,6 @@ void *aligned_alloc(size_t align, size_t len)
return NULL;
header = ((size_t *)mem)[-1];
end = mem + (header & -8);
footer = ((size_t *)end)[-2];
new = (void *)((uintptr_t)mem + align-1 & -align);
if (!(header & 7)) {
......@@ -41,6 +39,9 @@ void *aligned_alloc(size_t align, size_t len)
return new;
}
end = mem + (header & -8);
footer = ((size_t *)end)[-2];
((size_t *)mem)[-1] = header&7 | new-mem;
((size_t *)new)[-2] = footer&7 | new-mem;
((size_t *)new)[-1] = header&7 | end-new;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册