third_party/mach_override/mach_override.c - Issue 21208002: Ensure no RWX pages remain after mach_override_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mach_override/mach_override.c

Issue 21208002: Ensure no RWX pages remain after mach_override_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: typo printing incorrect error code Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/mach_override/mach_override.c

diff --git a/third_party/mach_override/mach_override.c b/third_party/mach_override/mach_override.c

index 549409d0b30b01a17c54d0f158773117a79a7e9f..ea41569518009e04c3c8f9056049438dc368d9af 100644

--- a/third_party/mach_override/mach_override.c

+++ b/third_party/mach_override/mach_override.c

@@ -156,7 +156,7 @@ mach_error_t makeIslandExecutable(void *address) {

mach_error_t err = err_none;

uintptr_t page = (uintptr_t)address & ~(uintptr_t)(kPageSize-1);

int e = err_none;

- e |= mprotect((void *)page, kPageSize, PROT_EXEC | PROT_READ | PROT_WRITE);

+ e |= mprotect((void *)page, kPageSize, PROT_EXEC | PROT_READ);

e |= msync((void *)page, kPageSize, MS_INVALIDATE );

if (e) {

err = err_cannot_override;

@@ -335,6 +335,12 @@ mach_override_ptr(

#endif

if ( !err )

atomic_mov64((uint64_t *)originalFunctionPtr, jumpRelativeInstruction);

+ mach_error_t prot_err = err_none;

+ prot_err = vm_protect( mach_task_self(),

+ (vm_address_t) originalFunctionPtr, 8, false,

+ (VM_PROT_READ | VM_PROT_EXECUTE) );

+ if (prot_err) fprintf(stderr, "err = %x %s:%d\n", prot_err, __FILE__, __LINE__);

}

#endif

« no previous file with comments | « third_party/mach_override/README.chromium ('k') | no next file » | no next file with comments »