git: 875f06276b8d - stable/13 - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 09 Sep 2023 08:28:00 UTC
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=875f06276b8d5e1b7bc435b0436c9f203c492e36 commit 875f06276b8d5e1b7bc435b0436c9f203c492e36 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2023-09-09 08:27:32 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); }