ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Remove the no longer used VPROT_NOEXEC flag.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-09-08 12:46:47 +02:00
parent 08acac0864
commit b2624ab99a
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntdll/virtual.c
View File

@ -713,7 +713,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
*view_ret = view; *view_ret = view;
VIRTUAL_DEBUG_DUMP_VIEW( view ); VIRTUAL_DEBUG_DUMP_VIEW( view );
if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC))
{ {
TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 );
mprotect( base, size, unix_prot | PROT_EXEC ); mprotect( base, size, unix_prot | PROT_EXEC );
@ -797,8 +797,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image
*/ */
static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect ) static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect )
{ {
if (force_exec_prot && !(view_protect & VPROT_NOEXEC) && if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC))
(unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC))
{ {
TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 );
if (!mprotect( base, size, unix_prot | PROT_EXEC )) return 0; if (!mprotect( base, size, unix_prot | PROT_EXEC )) return 0;
@ -1096,7 +1095,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start
assert( start < view->size ); assert( start < view->size );
assert( start + size <= view->size ); assert( start + size <= view->size );
if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (vprot & VPROT_READ)) if (force_exec_prot && (vprot & VPROT_READ))
{ {
TRACE( "forcing exec permission on mapping %p-%p\n", TRACE( "forcing exec permission on mapping %p-%p\n",
(char *)view->base + start, (char *)view->base + start + size - 1 ); (char *)view->base + start, (char *)view->base + start + size - 1 );
@ -1972,7 +1971,6 @@ void VIRTUAL_SetForceExec( BOOL enable )
{ {
BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */ BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */
if (view->protect & VPROT_NOEXEC) continue;
mprotect_range( view, view->base, view->size, commit, 0 ); mprotect_range( view, view->base, view->size, commit, 0 );
} }
} }

1
include/wine/server_protocol.h
View File

@ -2199,7 +2199,6 @@ struct create_mapping_reply
#define VPROT_IMAGE 0x0100 #define VPROT_IMAGE 0x0100
#define VPROT_SYSTEM 0x0200 #define VPROT_SYSTEM 0x0200
#define VPROT_VALLOC 0x0400 #define VPROT_VALLOC 0x0400
#define VPROT_NOEXEC 0x0800

1
server/protocol.def
View File

@ -1711,7 +1711,6 @@ enum char_info_mode
#define VPROT_IMAGE 0x0100 /* mapping for an exe image */ #define VPROT_IMAGE 0x0100 /* mapping for an exe image */
#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */
#define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */ #define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */
#define VPROT_NOEXEC 0x0800 /* don't force exec permission */
/* Open a mapping */ /* Open a mapping */