diff options
author | John Baldwin <jhb@FreeBSD.org> | 2017-01-30 23:13:41 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2017-01-30 23:13:41 +0000 |
commit | 2a7278307b06a849cb55289b755ae2975450a027 (patch) | |
tree | f0a7e82599be2c699024aeb0d833e2c99448fff6 | |
parent | 678bbc14b25b657d63c91fa9a4bd3068bf100bfa (diff) | |
download | src-2a7278307b06a849cb55289b755ae2975450a027.tar.gz src-2a7278307b06a849cb55289b755ae2975450a027.zip |
Remove a duplicate store when performing REL32 relocations in rtld.
The duplicate call to store_ptr() was added in r204687, but it should
have no effect as it only stores an Elf_Sword and the later store_ptr()
does a write that is at least as large if not larger.
Reviewed by: jmallett
Obtained from: CheriBSD (sort of)
Sponsored by: DARPA / AFRL
Notes
Notes:
svn path=/head/; revision=313003
-rw-r--r-- | libexec/rtld-elf/mips/reloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c index 59d3587a6d38..1d1e1a174a6a 100644 --- a/libexec/rtld-elf/mips/reloc.c +++ b/libexec/rtld-elf/mips/reloc.c @@ -215,7 +215,6 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) sym = symtab + r_symndx; assert(ELF_ST_BIND(sym->st_info) == STB_LOCAL); val += relocbase; - store_ptr(where, val, sizeof(Elf_Sword)); dbg("REL32/L(%p) %p -> %p in <self>", where, (void *)old, (void *)val); store_ptr(where, val, rlen); |