From 43fbaf9970ebe04c81c5544133480e74fd745a69 Mon Sep 17 00:00:00 2001
From: oddcoder <ahmedsoliman@oddcoder.com>
Date: Wed, 13 May 2020 23:27:16 +0200
Subject: [PATCH] Fix a bug in thread local reloations
There was a bug (also uncovered via binutils) where R_X86_64_DTPOFF64 is
set uncorrectly. This program is the minimal reproducer of the seg fault
#include <errno.h>
int main() {
int oerrno = errno;
}
But it works after the bug fix.
---
src/ld_so/linker.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index 47331f5a..4aea9b41 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -666,7 +666,7 @@ impl Linker {
set_u64(tm as u64);
}
reloc::R_X86_64_DTPOFF64 => {
- set_u64((s + a) as u64);
+ set_u64(rel.r_offset as u64);
}
reloc::R_X86_64_GLOB_DAT | reloc::R_X86_64_JUMP_SLOT => {
set_u64(s as u64);
--
GitLab