proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-06 21:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10360 from opensourcerouting/clippy-rel-endian

Browse Source 
lib/clippy: don't endian-convert twice
This commit is contained in:
Mark Stapp 2022-01-19 08:58:12 -05:00 committed by GitHub
commit b542c4a3c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/elf_py.c
View File

@ -1071,26 +1071,25 @@ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
* always be a pointer...
*/
if (elffile_virt2file(w, rel->r_offset, &offs)) {
Elf_Data *ptr, *conv;
GElf_Addr tmp;
Elf_Data mem = {
.d_buf = (void *)&tmp,
.d_type = ELF_T_ADDR,
.d_version = EV_CURRENT,
.d_size = sizeof(tmp),
.d_off = 0,
.d_align = 0,
};
Elf_Data *ptr;
/* NB: this endian-converts! */
ptr = elf_getdata_rawchunk(w->elf, offs,
w->elfclass / 8,
ELF_T_ADDR);
conv = gelf_xlatetom(w->elf, &mem, ptr,
w->mmap[EI_DATA]);
if (conv) {
memcpy(&rel_offs, conv->d_buf,
conv->d_size);
if (ptr) {
char *dst = (char *)&rel_offs;
/* sigh. it endian-converts. but
* doesn't size-convert.
*/
if (BYTE_ORDER == BIG_ENDIAN &&
ptr->d_size < sizeof(rel_offs))
dst += sizeof(rel_offs) -
ptr->d_size;
memcpy(dst, ptr->d_buf, ptr->d_size);
relw->relative = false;
relw->rela->r_addend = rel_offs;