From: John Hodge (sonata) <tpg@mutabah.net>
Date: Wed, 7 Aug 2013 14:26:15 +0000 (+0800)
Subject: Usermode/ld-acess - Disabled destructive relocation
X-Git-Tag: rel0.15~289
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=17ebf0cdf584b5eb63aa96149de3e4f76cb82e01;hp=3309f65447f4f2a7b1a8a7324a1b92eb8d26b590;p=tpg%2Facess2.git

Usermode/ld-acess - Disabled destructive relocation
---

diff --git a/Usermode/Libraries/ld-acess.so_src/elf.c b/Usermode/Libraries/ld-acess.so_src/elf.c
index 531b32d7..15e84209 100644
--- a/Usermode/Libraries/ld-acess.so_src/elf.c
+++ b/Usermode/Libraries/ld-acess.so_src/elf.c
@@ -286,19 +286,19 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename)
 		case DT_SYMTAB:
 			DEBUGS(" elf_relocate: DYNAMIC Symbol Table 0x%x (0x%x)",
 				dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);
-			if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
-			dynsymtab = (void*)(intptr_t)dynamicTab[j].d_val;
+			dynsymtab = (void*)((intptr_t)dynamicTab[j].d_val + iBaseDiff);
+			//if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
 			break;
 		// --- String Table ---
 		case DT_STRTAB:
 			DEBUGS(" elf_relocate: DYNAMIC String Table 0x%x (0x%x)",
 				dynamicTab[j].d_val, dynamicTab[j].d_val + iBaseDiff);
-			if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
-			dynstrtab = (void*)(intptr_t)dynamicTab[j].d_val;
+			dynstrtab = (void*)((intptr_t)dynamicTab[j].d_val + iBaseDiff);
+			//if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
 			break;
 		// --- Hash Table --
 		case DT_HASH:
-			if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
+			//if(iBaseDiff != 0)	dynamicTab[j].d_val += iBaseDiff;
 //			iSymCount = ((Elf32_Word*)(intptr_t)dynamicTab[j].d_val)[1];
 			break;
 		}
@@ -325,6 +325,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename)
 		// --- Needed Library ---
 		case DT_NEEDED:
 			libPath = dynstrtab + dynamicTab[j].d_val;
+			DEBUGS(" dynstrtab = %p, d_val = 0x%x", dynstrtab, dynamicTab[j].d_val);
 			DEBUGS(" Required Library '%s'", libPath);
 			if(LoadLibrary(libPath, NULL, envp) == 0) {
 				#if DEBUG
@@ -506,14 +507,14 @@ int Elf32GetSymbol(void *Base, const char *Name, void **ret, size_t *Size)
 		{
 		// --- Symbol Table ---
 		case DT_SYMTAB:
-			symtab = (void*)(intptr_t) dynTab[i].d_val;	// Rebased in Relocate
+			symtab = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff);	// Rebased in Relocate
 			break;
 		case DT_STRTAB:
-			dynstrtab = (void*)(intptr_t) dynTab[i].d_val;
+			dynstrtab = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff);
 			break;
 		// --- Hash Table --
 		case DT_HASH:
-			pBuckets = (void*)(intptr_t) dynTab[i].d_val;
+			pBuckets = (void*)((intptr_t)dynTab[i].d_val + iBaseDiff);
 			break;
 		}
 	}