mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 07:16:40 +00:00
Code Issues Projects Releases Wiki Activity

[lld/mac] Allow -segprot having stricter initprot than maxprot on mac (#107269)

Browse Source 
...including for catalyst.

The usecase for this is to put certain security-critical variables into
a special segment/section that's mapped as read-only most of the time,
and that temporary gets remapped as writeable when these variables are
written to be the program. This protects against them being written to
by heap spraying attacks. This special section should be mapped as
read-only at program start, so using

`-segprot MY_PROTECTED_MEMORY_THINGER rw r`

to mark that segment as rw maxprot and r initprot is exactly what we
want.

lld has so far rejected mismatching initprot and maxprot.

ld64 doesn't reject this, but silently writes initprot into both fields
(!) It looks like this might not be fully intentional, see
https://crbug.com/41495919#comment5 and
http://crbug.com/41495919#comment8.

In any case, when postprocessing ld64's output to have different values
for initprot and maxprot, the dynamic loader seems to do the right thing
(see also the previous two links).

The same technique also works on Windows, using both link.exe and
lld-link.exe using `/SECTION:myprotsect,R`.

So, since this is useful, allow it when targeting macOS, and make it do
what you'd expect.

Since loader support for this on iOS is less clear, keep disallowing it
there for now.

See the PR for the program I used to check that this seems to work. (I
only checked on arm64 macOS 14.5 so far; will run this on many more
systems on bots once this is merged and rolled in.)
This commit is contained in:
Nico Weber 2024-09-05 12:29:46 -04:00 committed by GitHub
parent be1958fd48
commit 62e6c1ead7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/MachO/Driver.cpp
View File

@ -1882,9 +1882,21 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
StringRef segName = arg->getValue(0);
uint32_t maxProt = parseProtection(arg->getValue(1));
uint32_t initProt = parseProtection(arg->getValue(2));
if (maxProt != initProt && config->arch() != AK_i386)
error("invalid argument '" + arg->getAsString(args) +
"': max and init must be the same for non-i386 archs");
// FIXME: Check if this works on more platforms.
bool allowsDifferentInitAndMaxProt =
config->platform() == PLATFORM_MACOS ||
config->platform() == PLATFORM_MACCATALYST;
if (allowsDifferentInitAndMaxProt) {
if (initProt > maxProt)
error("invalid argument '" + arg->getAsString(args) +
"': init must not be more permissive than max");
} else {
if (maxProt != initProt && config->arch() != AK_i386)
error("invalid argument '" + arg->getAsString(args) +
"': max and init must be the same for non-macOS non-i386 archs");
}
if (segName == segment_names::linkEdit)
error("-segprot cannot be used to change __LINKEDIT's protections");
config->segmentProtections.push_back({segName, maxProt, initProt});

6
lld/MachO/OutputSegment.cpp
View File

@ -42,6 +42,12 @@ static uint32_t initProt(StringRef name) {
static uint32_t maxProt(StringRef name) {
assert(config->arch() != AK_i386 &&
"TODO: i386 has different maxProt requirements");
auto it = find_if(
config->segmentProtections,
[&](const SegmentProtection &segprot) { return segprot.name == name; });
if (it != config->segmentProtections.end())
return it->maxProt;
return initProt(name);
}

41
lld/test/MachO/segprot.s
View File

@ -2,7 +2,10 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
## Make sure the option parser doesn't think --x and -w are flags.
# RUN: %lld -dylib -o %t %t.o -segprot FOO rwx xwr -segprot BAR --x --x -segprot BAZ -w -w
# RUN: %lld -dylib -o %t %t.o \
# RUN: -segprot FOO rwx xwr \
# RUN: -segprot BAR --x --x \
# RUN: -segprot BAZ -w -w
# RUN: llvm-readobj --macho-segment %t | FileCheck %s
# CHECK: Name: FOO
@ -32,12 +35,38 @@
# CHECK-NEXT: maxprot: -w-
# CHECK-NEXT: initprot: -w-
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO rwx rw 2>&1 | FileCheck %s --check-prefix=MISMATCH
# RUN: not %lld -dylib -o /dev/null %t.o -segprot __LINKEDIT rwx rwx 2>&1 | FileCheck %s --check-prefix=NO-LINKEDIT
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO uhh wat 2>&1 | FileCheck %s --check-prefix=MISPARSE
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO rwx 2>&1 | FileCheck %s --check-prefix=MISSING
# RUN: %lld -dylib -o %t.different %t.o -segprot FOO rw r
# RUN: llvm-readobj --macho-segment %t.different \
# RUN: | FileCheck %s --check-prefix=DIFFERENT
# MISMATCH: error: invalid argument '-segprot FOO rwx rw': max and init must be the same for non-i386 archs
# RUN: %no-arg-lld -arch x86_64 -platform_version "mac catalyst" 14.0.0 17.5 \
# RUN: -dylib -o /dev/null %t.o -segprot FOO rw r
# RUN: llvm-readobj --macho-segment %t.different \
# RUN: | FileCheck %s --check-prefix=DIFFERENT
# DIFFERENT: Name: FOO
# DIFFERENT-NEXT: Size:
# DIFFERENT-NEXT: vmaddr:
# DIFFERENT-NEXT: vmsize:
# DIFFERENT-NEXT: fileoff:
# DIFFERENT-NEXT: filesize:
# DIFFERENT-NEXT: maxprot: rw-
# DIFFERENT-NEXT: initprot: r--
# RUN: not %no-arg-lld -arch x86_64 -platform_version ios-simulator 14.0 15.0 \
# RUN: -dylib -o /dev/null %t.o -segprot FOO rwx rw 2>&1 \
# RUN: | FileCheck %s --check-prefix=MISMATCH
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO r rw 2>&1 \
# RUN: | FileCheck %s --check-prefix=INITTOOPERMISSIVE
# RUN: not %lld -dylib -o /dev/null %t.o -segprot __LINKEDIT rwx rwx 2>&1 \
# RUN: | FileCheck %s --check-prefix=NO-LINKEDIT
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO uhh wat 2>&1 \
# RUN: | FileCheck %s --check-prefix=MISPARSE
# RUN: not %lld -dylib -o /dev/null %t.o -segprot FOO rwx 2>&1 \
# RUN: | FileCheck %s --check-prefix=MISSING
# MISMATCH: error: invalid argument '-segprot FOO rwx rw': max and init must be the same for non-macOS non-i386 archs
# INITTOOPERMISSIVE: error: invalid argument '-segprot FOO r rw': init must not be more permissive than max
# NO-LINKEDIT: error: -segprot cannot be used to change __LINKEDIT's protections
# MISPARSE: error: unknown -segprot letter 'u' in uhh
# MISPARSE: error: unknown -segprot letter 'a' in wat