vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DTPMOD relocation

Browse Source
This commit is contained in:
Jeremy Soller
2025-05-09 10:06:06 -06:00
parent b887ad1ce6
commit 0bd38ac2ad
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ld_so/dso.rs
+12 -6
View File
@@ -836,10 +836,11 @@ impl DSO {
(None, None)
};
let (s, t) = sym
let (s, t, tls_id) = sym
.as_ref()
.map(|(sym, obj)| (sym.as_ptr() as usize, obj.tls_offset))
.unwrap_or((0, 0));
.map(|(sym, obj)| (sym.as_ptr() as usize, obj.tls_offset, obj.tls_module_id))
//TODO: is self.tls_module_id the right fallback?
.unwrap_or((0, 0, self.tls_module_id));
let ptr = if self.pie {
(b + reloc.offset) as *mut u8
@@ -861,7 +862,7 @@ impl DSO {
};
match reloc.kind {
RelocationKind::DTPMOD => set_usize(self.tls_module_id),
RelocationKind::DTPMOD => set_usize(tls_id),
//TODO: Subtract DTP_OFFSET, which is 0x800 on riscv64, 0 on x86?
RelocationKind::DTPOFF => {
if reloc.sym.0 > 0 {
@@ -872,7 +873,7 @@ impl DSO {
} else {
set_usize(a);
}
},
}
RelocationKind::GOT => set_usize(s),
RelocationKind::OFFSET => set_usize((s + a).wrapping_sub(p)),
RelocationKind::RELATIVE => set_usize(b + a),
@@ -960,7 +961,12 @@ impl DSO {
let resolved = resolve_sym(name, &[global_scope, self.scope()])
.map(|(sym, _, _)| sym.as_ptr() as usize)
.unwrap_or_else(|| panic!("unresolved symbol: {name} for soname {:?}", self.dynamic.soname));
.unwrap_or_else(|| {
panic!(
"unresolved symbol: {name} for soname {:?}",
self.dynamic.soname
)
});
unsafe {
*ptr = resolved + reloc.addend.unwrap_or(0);