Commit 33817794268b5453794f98ee752403ff44693112 | zig

author	Isaac Freund <mail@isaacfreund.com> 2022-06-08 14:33:11+02:00
committer	Isaac Freund <mail@isaacfreund.com> 2022-06-08 14:33:11+02:00
log	33817794268b5453794f98ee752403ff44693112
tree	5d869719d15d72fb2e14bfdbe5cf32c46ce091ec
parent	61844b6bd405b4cca3ab673284609aa6a651d506
signature	Commit is signed but in an unrecognized format.

linker: Enable full RELRO by default

Full RELRO is a hardening feature that makes it impossible to perform
certian attacks involving overwriting parts of the Global Offset Table
to invoke arbitrary code.

It requires all symbols to be resolved before execution of the program
starts which may have an impact on startup time. However most if
not all popular Linux distributions enable full RELRO by default for
all binaries and this does not seem to make a noticeable difference
in practice.

"Partial RELRO" is equivalent to `-z relro -z lazy`.
"Full RELRO" is equivalent to `-z relro -z now`.

LLD defaults to `-z relro -z lazy`, which means Zig's current `-z relro`
option has no effect on LLD's behavior.

The changes made by this commit are as follows:

- Document that `-z relro` is the default and add `-z norelro`.
- Pass `-z now` to LLD by default to enable full RELRO by default.
- Add `-z lazy` to disable passing `-z now`.

3 files changed, 21 insertions(+), 11 deletions(-)

src
- Compilation.zig
- link
  - Elf.zig
- main.zig

src/Compilation.zig+2-2

...	@@ -763,8 +763,8 @@ pub const InitOptions = struct {	...	@@ -763,8 +763,8 @@ pub const InitOptions = struct {
763	linker_z_defs: bool = false,	763	linker_z_defs: bool = false,
764	linker_z_origin: bool = false,	764	linker_z_origin: bool = false,
765	linker_z_noexecstack: bool = false,	765	linker_z_noexecstack: bool = false,
766	linker_z_now: bool = false,	766	linker_z_now: bool = true,
767	linker_z_relro: bool = false,	767	linker_z_relro: bool = true,
768	linker_z_nocopyreloc: bool = false,	768	linker_z_nocopyreloc: bool = false,
769	linker_tsaware: bool = false,	769	linker_tsaware: bool = false,
770	linker_nxcompat: bool = false,	770	linker_nxcompat: bool = false,

src/link/Elf.zig+5-5

...	@@ -1517,12 +1517,12 @@ fn linkWithLLD(self: Elf, comp: Compilation, prog_node: *std.Progress.Node) !v	...	@@ -1517,12 +1517,12 @@ fn linkWithLLD(self: Elf, comp: Compilation, prog_node: *std.Progress.Node) !v
1517	try argv.append("noexecstack");	1517	try argv.append("noexecstack");
1518	}	1518	}
1519	if (self.base.options.z_now) {	1519	if (self.base.options.z_now) {
1520	try argv.append("-z");	1520	// LLD defaults to -zlazy
1521	try argv.append("now");	1521	try argv.append("-znow");
1522	}	1522	}
1523	if (self.base.options.z_relro) {	1523	if (!self.base.options.z_relro) {
1524	try argv.append("-z");	1524	// LLD defaults to -zrelro
1525	try argv.append("relro");	1525	try argv.append("-znorelro");
1526	}	1526	}
1527		1527
1528	if (getLDMOption(target)) \|ldm\| {	1528	if (getLDMOption(target)) \|ldm\| {

src/main.zig+14-4

 @@ -434,8 +434,10 @@ const usage_build_generic =
     \\    origin                       Indicate that the object must have its origin processed
     \\    nocopyreloc                  Disable the creation of copy relocations
     \\    noexecstack                  Indicate that the object requires an executable stack
-    \\    now                          Force all relocations to be processed on load
+    \\    now                          (default) Force all relocations to be processed on load
-    \\    relro                        Force all relocations to be resolved and be read-only on load
+    \\    lazy                         Don't force all relocations to be processed on load
+    \\    relro                        (default) Force all relocations to be read-only after processing
+    \\    norelro                      Don't force all relocations to be read-only after processing
     \\  -dynamic                       Force output to be dynamically linked
     \\  -static                        Force output to be statically linked
     \\  -Bsymbolic                     Bind global references locally
 @@ -655,8 +657,8 @@ fn buildOutputType(
     var linker_z_defs = false;
     var linker_z_origin = false;
     var linker_z_noexecstack = false;
-    var linker_z_now = false;
+    var linker_z_now = true;
-    var linker_z_relro = false;
+    var linker_z_relro = true;
     var linker_tsaware = false;
     var linker_nxcompat = false;
     var linker_dynamicbase = false;
 @@ -1209,8 +1211,12 @@ fn buildOutputType(
                             linker_z_noexecstack = true;
                         } else if (mem.eql(u8, z_arg, "now")) {
                             linker_z_now = true;
+                        } else if (mem.eql(u8, z_arg, "lazy")) {
+                            linker_z_now = false;
                         } else if (mem.eql(u8, z_arg, "relro")) {
                             linker_z_relro = true;
+                        } else if (mem.eql(u8, z_arg, "norelro")) {
+                            linker_z_relro = false;
                         } else {
                             warn("unsupported linker extension flag: -z {s}", .{z_arg});
                         }
 @@ -1691,8 +1697,12 @@ fn buildOutputType(
                         linker_z_noexecstack = true;
                     } else if (mem.eql(u8, z_arg, "now")) {
                         linker_z_now = true;
+                    } else if (mem.eql(u8, z_arg, "lazy")) {
+                        linker_z_now = false;
                     } else if (mem.eql(u8, z_arg, "relro")) {
                         linker_z_relro = true;
+                    } else if (mem.eql(u8, z_arg, "norelro")) {
+                        linker_z_relro = false;
                     } else {
                         warn("unsupported linker extension flag: -z {s}", .{z_arg});
                     }