Skip to content

Disable DEP qualifications outside of MSVC #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable DEP qualifications outside of MSVC #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/trusted/platform_qualify/win/nacl_dep_qualify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@


int NaClAttemptToExecuteDataAtAddr(uint8_t *thunk_buffer, size_t size) {
#if defined(_MSC_VER)
int got_fault = 0;
nacl_void_thunk thunk = NaClGenerateThunk(thunk_buffer, size);
__try {
Expand All @@ -28,12 +29,16 @@ int NaClAttemptToExecuteDataAtAddr(uint8_t *thunk_buffer, size_t size) {
got_fault = 1;
}
return got_fault;
#else
return 1;
#endif
}

/*
* Returns 1 if Data Execution Prevention is present and working.
*/
int NaClAttemptToExecuteData(void) {
#if defined(_MSC_VER)
int result;
uint8_t *thunk_buffer = malloc(64);
if (NULL == thunk_buffer) {
Expand All @@ -42,4 +47,7 @@ int NaClAttemptToExecuteData(void) {
result = NaClAttemptToExecuteDataAtAddr(thunk_buffer, 64);
free(thunk_buffer);
return result;
#else
return 1;
#endif
}