1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
https://github.com/FRRouting/frr/commit/cfc45e911e21820bc8b703b37e947a6a7e5d798a.patch
https://github.com/FRRouting/frr/issues/10051
From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 18 Jan 2022 09:50:25 +0100
Subject: [PATCH] lib/clippy: don't endian-convert twice
elf_getdata_rawchunk() already endian-converts; doing it again is, uh,
counterproductive.
Fixes: #10051
Reported-by: Lucian Cristian <lucian.cristian@gmail.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
--- a/lib/elf_py.c
+++ b/lib/elf_py.c
@@ -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;
|
