Skip to content

android: add VPROT_WRITECOPY to PE header protection #26

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
idans320 wants to merge 1 commit into
base: proton_11.0
Choose a base branch
from
+13 −4
Open

android: add VPROT_WRITECOPY to PE header protection #26

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
17 changes: 13 additions & 4 deletions android/patches/dlls_ntdll_unix_virtual.c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 6e1697720f0..c12be9ba401 100644
index 6e1697720f0..bcd4f3a1922 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -100,6 +100,10 @@
#include "unix_private.h"
#include "wine/debug.h"

+#ifdef __ANDROID__
+#include "../../android/shm_utils/shm_utils.h"
+#endif
Expand Down Expand Up @@ -35,7 +35,7 @@ index 6e1697720f0..c12be9ba401 100644
{
+#ifndef __ANDROID__
struct uffdio_api uffdio_api;

uffd_fd = syscall( __NR_userfaultfd, O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY );
@@ -439,6 +450,10 @@ static void kernel_writewatch_init(void)
}
Expand All @@ -46,5 +46,14 @@ index 6e1697720f0..c12be9ba401 100644
+ use_kernel_writewatch = 0;
+#endif
}

static void kernel_writewatch_reset( void *start, SIZE_T len )
@@ -3473,7 +3488,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const UNICODE_STRIN

/* set the image protections */

- set_vprot( view, ptr, ROUND_SIZE( 0, header_size, align_mask ), VPROT_COMMITTED | VPROT_READ );
+ set_vprot( view, ptr, ROUND_SIZE( 0, header_size, align_mask ), VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY );

for (i = 0; i < nt->FileHeader.NumberOfSections; i++)
{