AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-25 12:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: Avoid UB in elf_machine_rel()

Browse Source 
This recently came up during a cleanup to remove misaligned accesses
from the RISC-V port.

Link: https://sourceware.org/pipermail/libc-alpha/2022-June/139961.html
Suggested-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Fangrui Song <maskray@google.com>
This commit is contained in:
Palmer Dabbelt 2022-06-23 14:49:32 -07:00 committed by Andreas K. Hüttel
parent a10b6ad471
commit 07fe71f59b
No known key found for this signature in database
GPG Key ID: DC2B16215ED5412A
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/arm/dl-machine.h
View File

@ -349,10 +349,7 @@ elf_machine_rel (struct link_map *map, struct r_scope_elem *scope[],
break;
case R_ARM_ABS32:
{
struct unaligned
{
Elf32_Addr x;
} __attribute__ ((packed, may_alias));
ElfW(Addr) tmp;
# ifndef RTLD_BOOTSTRAP
/* This is defined in rtld.c, but nowhere in the static
libc.a; make the reference weak so static programs can
@ -372,7 +369,9 @@ elf_machine_rel (struct link_map *map, struct r_scope_elem *scope[],
value -= SYMBOL_ADDRESS (map, refsym, true);
# endif
/* Support relocations on mis-aligned offsets. */
((struct unaligned *) reloc_addr)->x += value;
memcpy (&tmp, reloc_addr, sizeof tmp);
tmp += value;
memcpy (reloc_addr, &tmp, sizeof tmp);
break;
}
case R_ARM_TLS_DESC: