Skip to content

Commit 7a0b129

Browse files
committed
guix: patch NSIS to remove .reloc sections from install stubs
With the release of binutils/ld 2.36, ld swapped to much improved default settings when producing windows binaries with mingw-w64. One of these changes was to stop stripping the .reloc section from binaries, which is required for working ASLR. .reloc section stripping is something we've accounted for previously, see #18702. The related upstream discussion is in this thread: https://sourceware.org/bugzilla/show_bug.cgi?id=19011. When we switched to using a newer Guix time-machine in #23778, we begun using binutils 2.37 to produce releases. Since then, our windows installer (produced with makensis) has not functioned correctly when run on a Windows system with the "Force randomization for images (Mandatory ASLR)" option enabled. Note that all of our other release binaries, which all contain .reloc sections, function fine under the same option, so it cannot be just the presence of a .reloc section that is the issue. For now, restore makensis to it's pre-binutils-2.36 behaviour, which fixes the produced installer. The underlying issue can be further investigated in future.
1 parent 7d3817b commit 7a0b129

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

contrib/guix/manifest.scm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ chain for " target " development."))
194194

195195
(define (make-nsis-for-gcc-10 base-nsis)
196196
(package-with-extra-patches base-nsis
197-
(search-our-patches "nsis-gcc-10-memmove.patch")))
197+
(search-our-patches "nsis-gcc-10-memmove.patch"
198+
"nsis-disable-installer-reloc.patch")))
198199

199200
(define (fix-ppc64-nx-default lief)
200201
(package-with-extra-patches lief
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Patch NSIS so that it's installer stubs, produced at NSIS build time,
2+
do not contain .reloc sections, which will exist by default when using
3+
binutils/ld 2.36+.
4+
5+
This ultimately fixes an issue when running the installer with the
6+
"Force randomization for images (Mandatory ASLR)" setting active.
7+
8+
This patch has not yet been sent upstream, because it's not clear if this
9+
is the best fix, for the underlying issue, which seems to be that makensis
10+
doesn't account for .reloc sections when it builds installers.
11+
12+
The existence of a reloc section shouldn't be a problem, and, if anything,
13+
is actually a requirement for working ASLR. All other Windows binaries we
14+
produce contain them, and function correctly when under the same
15+
"Force randomization for images (Mandatory ASLR)" setting.
16+
17+
See:
18+
https://github.com/bitcoin/bitcoin/issues/25726
19+
https://sourceforge.net/p/nsis/bugs/1131/
20+
21+
--- a/SCons/Config/gnu
22+
+++ b/SCons/Config/gnu
23+
@@ -102,6 +102,7 @@ stub_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables
24+
stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries
25+
stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align
26+
stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
27+
+stub_env.Append(LINKFLAGS = ['-Wl,--disable-reloc-section'])
28+
29+
conf = FlagsConfigure(stub_env)
30+
conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248)

0 commit comments

Comments
 (0)