1From f8e4118b60a9b54950437006a82b4047f38f5347 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:13:59 +0800
4Subject: [PATCH] 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---
17 libelf/gnuhash_xlate.h | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
21index 6faf113..04d9ca1 100644
22--- a/libelf/gnuhash_xlate.h
23+++ b/libelf/gnuhash_xlate.h
24@@ -40,6 +40,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
25      words.  We must detangle them here.   */
26   Elf32_Word *dest32 = dest;
27   const Elf32_Word *src32 = src;
28+  Elf32_Word save_src32_2 = src32[2]; // dest could be equal to src
29
30   /* First four control words, 32 bits.  */
31   for (unsigned int cnt = 0; cnt < 4; ++cnt)
32@@ -50,7 +51,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
33       len -= 4;
34     }
35
36-  Elf32_Word bitmask_words = encode ? src32[2] : dest32[2];
37+  Elf32_Word bitmask_words = encode ? save_src32_2 : dest32[2];
38
39   /* Now the 64 bit words.  */
40   Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4];
41