reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 05:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ntdll: Check file size when mapping image sections to avoid SIGBUS errors.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-01-03 17:39:23 +01:00
parent 73b7900b8b
commit 67f29999a3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ntdll/virtual.c
View File

@ -35,6 +35,7 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
@ -835,6 +836,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
NTSTATUS status = STATUS_CONFLICTING_ADDRESSES;
int i;
off_t pos;
struct stat st;
struct file_view *view = NULL;
char *ptr;
@ -857,7 +859,13 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
/* map the header */
if (fstat( fd, &st ) == -1)
{
status = FILE_GetNtStatus();
goto error;
}
status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */
if (header_size > st.st_size) goto error;
if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ,
removable ) != STATUS_SUCCESS) goto error;
dos = (IMAGE_DOS_HEADER *)ptr;
@ -996,7 +1004,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
/* Note: if the section is not aligned properly map_file_into_view will magically
* fall back to read(), so we don't need to check anything here.
*/
if (map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData,
end = sec->PointerToRawData + file_size;
if (sec->PointerToRawData >= st.st_size || end > st.st_size || end < sec->PointerToRawData ||
map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData,
VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY,
removable ) != STATUS_SUCCESS)
{