fixed the alsr linker script

Purdue-eCTF · Mar 7, 2024 · 91a16e8 · 91a16e8
1 parent 332ab73
commit 91a16e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/application_processor/build.rs b/application_processor/build.rs
@@ -215,8 +215,9 @@ fn main() {
 
         println!("cargo:rustc-link-arg=--nmagic");
 
-        // Set the linker script to the one provided by cortex-m-rt.
+        // FIXME: make sure we are not accidently using cortex-m-rt linker script
         println!("cargo:rustc-link-arg=-Tlink.x");
+        println!("cargo:rerun-if-changed=link.x");
     }
 
     let mut post_boot_build = cc::Build::new();

diff --git a/application_processor/link.x b/application_processor/link.x
@@ -148,7 +148,7 @@ SECTIONS
   __edata = .;
 
   /* LMA of .data */
-  __sidata = LOADADDR(.data);
+  __sidata = LOADADDR(.data) + dataoffset;
 
   /* ### .gnu.sgstubs
      This section contains the TrustZone-M veneers put there by the Arm GNU linker. */

diff --git a/component/build.rs b/component/build.rs
@@ -194,8 +194,9 @@ fn main() {
 
         println!("cargo:rustc-link-arg=--nmagic");
 
-        // Set the linker script to the one provided by cortex-m-rt.
+        // FIXME: make sure we are not accidently using cortex-m-rt linker script
         println!("cargo:rustc-link-arg=-Tlink.x");
+        println!("cargo:rerun-if-changed=link.x");
     }
 
     let mut post_boot_build = cc::Build::new();

diff --git a/component/link.x b/component/link.x
@@ -148,7 +148,7 @@ SECTIONS
   __edata = .;
 
   /* LMA of .data */
-  __sidata = LOADADDR(.data);
+  __sidata = LOADADDR(.data) + dataoffset;
 
   /* ### .gnu.sgstubs
      This section contains the TrustZone-M veneers put there by the Arm GNU linker. */