wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 44cb0afb2571984bda8ca1fa084a50c1fc04ac71.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-25 13:15:02 +02:00
parent 48ffaa6b21
commit 094f2d8d0c
14 changed files with 302 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch
View File

@@ -1,39 +1,55 @@
From 62e317a96953781723231782f4d5b2392b347fe5 Mon Sep 17 00:00:00 2001
From 4c3ec3a9f0ed4523f6d6f7bcba9540803eea8a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 1 Jun 2017 06:04:53 +0200
Subject: ntdll: Fix holes in ELF mappings. (v2)
Based on a patch by Andrew Wesie.
---
dlls/ntdll/virtual.c | 14 ++++++++++++++
dlls/ntdll/virtual.c | 23 +++++++++++++++++++++++
dlls/psapi/tests/psapi_main.c | 14 +++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 25946c22c97..2305bfb47f3 100644
index 0b813d3b0e9..b10c36c3f69 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1720,6 +1720,20 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ) ret = STATUS_SUCCESS;
else update_shared_data = FALSE;
}
+ else if (!err && (view->protect & VPROT_SYSTEM) && (VIRTUAL_GetUnixProt( vprot ) & PROT_READ))
+ {
+ int unix_prot = VIRTUAL_GetUnixProt( vprot );
+ unsigned char vec;
@@ -425,6 +425,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size )
}
+/***********************************************************************
+ * is_system_range
+ */
+static inline BOOL is_system_range( const void *addr, size_t size )
+{
+ struct file_view *view = VIRTUAL_FindView( addr, size );
+ return view && (view->protect & VPROT_SYSTEM);
+}
+
+ if (!VIRTUAL_SetProt( view, page, page_size, vprot ))
+ set_page_vprot_bits( page, page_size, 0, VPROT_READ | VPROT_EXEC );
+ else if (!mincore( page, page_size, &vec ) && (vec & 1))
+ ret = STATUS_SUCCESS;
+ else if (wine_anon_mmap( page, page_size, unix_prot, MAP_FIXED ) != page)
+ set_page_vprot_bits( page, page_size, 0, VPROT_READ | VPROT_EXEC );
+ else
+ ret = STATUS_SUCCESS;
+ }
if (!on_signal_stack && (vprot & VPROT_GUARD))
{
set_page_vprot_bits( page, page_size, 0, VPROT_GUARD );
+
/***********************************************************************
* find_view_range
*
@@ -1822,6 +1832,19 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_READ) ret = STATUS_SUCCESS;
else update_shared_data = FALSE;
}
+ else if (!err && (VIRTUAL_GetUnixProt( vprot ) & PROT_READ) && is_system_range( page, page_size ))
+ {
+ int unix_prot = VIRTUAL_GetUnixProt( vprot );
+ unsigned char vec;
+
+ mprotect_range( page, page_size, 0, 0 );
+ if (!mincore( page, page_size, &vec ) && (vec & 1))
+ ret = STATUS_SUCCESS;
+ else if (wine_anon_mmap( page, page_size, unix_prot, MAP_FIXED ) == page)
+ ret = STATUS_SUCCESS;
+ else
+ set_page_vprot_bits( page, page_size, 0, VPROT_READ | VPROT_EXEC );
+ }
server_leave_uninterrupted_section( &csVirtual, &sigset );
if (update_shared_data)
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index e35a7b694cb..e7af5bc61cc 100644
--- a/dlls/psapi/tests/psapi_main.c