This is an archive of the discontinued LLVM Phabricator instance.

Differential D155144

[scudo] Return NULL when MAP_ALLOWNOMEM is set on Trusty
ClosedPublic

Authored by ahomescu on Jul 12 2023, 7:03 PM.

Details

Reviewers
Chia-hungDuan
cferris
Commits
rGe4316a599727: [scudo] Return NULL when MAP_ALLOWNOMEM is set on Trusty
Summary

Back-ported from https://r.android.com/2591905.

Diff Detail

Event Timeline

ahomescu created this revision.Jul 12 2023, 7:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 12 2023, 7:03 PM
Herald added subscribers: yaneury, Enna1, JDevlieghere. · View Herald Transcript
ahomescu requested review of this revision.Jul 12 2023, 7:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 12 2023, 7:04 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
ahomescu updated this revision to Diff 539819.Jul 12 2023, 7:06 PM

Resolved comments.

ahomescu updated this revision to Diff 539824.Jul 12 2023, 7:13 PM

Rebased.

Harbormaster completed remote builds in B244972: Diff 539824.Jul 12 2023, 7:52 PM
Chia-hungDuan accepted this revision.Jul 17 2023, 1:59 PM

Do you want to update the commit message and the title here?

This revision is now accepted and ready to land.Jul 17 2023, 1:59 PM
ahomescu updated this revision to Diff 541281.Jul 17 2023, 5:19 PM

Updated commit message.

Harbormaster completed remote builds in B246037: Diff 541281.Jul 17 2023, 5:48 PM
Chia-hungDuan mentioned this in D152888: [scudo] Enabled MAP_ALLOWNOMEM for all platforms.Jul 17 2023, 6:25 PM
Chia-hungDuan retitled this revision from [scudo] Return NULL on Trusty secondary allocation failure to [scudo] Return NULL when MAP_ALLOWNOMEM is set on Trusty.Jul 24 2023, 6:17 PM

Will merge this by tomorrow

Closed by commit rGe4316a599727: [scudo] Return NULL when MAP_ALLOWNOMEM is set on Trusty (authored by ahomescu, committed by Chia-hungDuan). · Explain WhyJul 25 2023, 8:29 AM
This revision was automatically updated to reflect the committed changes.
Chia-hungDuan added a commit: rGe4316a599727: [scudo] Return NULL when MAP_ALLOWNOMEM is set on Trusty.

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
3 lines

Diff 543993

compiler-rt/lib/scudo/standalone/trusty.cpp

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Linesvoid *map(void *Addr, uptr Size, const char *Name, uptr Flags,
if (Flags & MAP_MEMTAG) if (Flags & MAP_MEMTAG)
MmapFlags |= MMAP_FLAG_PROT_MTE; MmapFlags |= MMAP_FLAG_PROT_MTE;
void *P = (void *)_trusty_mmap(Addr, Size, MmapFlags, 0); void *P = (void *)_trusty_mmap(Addr, Size, MmapFlags, 0);
if (IS_ERR(P)) { if (IS_ERR(P)) {
errno = lk_err_to_errno(PTR_ERR(P)); errno = lk_err_to_errno(PTR_ERR(P));
if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
dieOnMapUnmapError(Size); dieOnMapUnmapError(Size);
return nullptr; return nullptr;
} }
return P; return P;
} }
void unmap(UNUSED void *Addr, UNUSED uptr Size, UNUSED uptr Flags, void unmap(UNUSED void *Addr, UNUSED uptr Size, UNUSED uptr Flags,
UNUSED MapPlatformData *Data) { UNUSED MapPlatformData *Data) {
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines