blob: 86d26bdf355f8fb881d7bfde2b99e964fddffe6a [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 9fd4bb05d3f2b7eaf9fe441bee26d3b1878d7cc7 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:13:59 +0800
4Subject: [PATCH 2/7] Fix elf_cvt_gunhash if dest and src are same.
5
6Upstream-Status: Pending
7
8The 'dest' and 'src' can be same, we need to save the value of src32[2]
9before swaping it.
10
11Signed-off-by: Baoshan Pang <BaoShan.Pang@windriver.com>
12
13Rebase to 0.170
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 libelf/gnuhash_xlate.h | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
20index 6faf113..04d9ca1 100644
21--- a/libelf/gnuhash_xlate.h
22+++ b/libelf/gnuhash_xlate.h
23@@ -40,6 +40,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
24 words. We must detangle them here. */
25 Elf32_Word *dest32 = dest;
26 const Elf32_Word *src32 = src;
27+ Elf32_Word save_src32_2 = src32[2]; // dest could be equal to src
28
29 /* First four control words, 32 bits. */
30 for (unsigned int cnt = 0; cnt < 4; ++cnt)
31@@ -50,7 +51,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
32 len -= 4;
33 }
34
35- Elf32_Word bitmask_words = encode ? src32[2] : dest32[2];
36+ Elf32_Word bitmask_words = encode ? save_src32_2 : dest32[2];
37
38 /* Now the 64 bit words. */
39 Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4];
40--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800412.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -050042