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

ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-10-16 08:57:21 +02:00 committed by Alexandre Julliard
parent 9912ef778f
commit b466e89311
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/ntoskrnl.exe/ntoskrnl.c
View File

@ -820,6 +820,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device,
{ {
PIRP irp; PIRP irp;
PIO_STACK_LOCATION irpsp; PIO_STACK_LOCATION irpsp;
MDL *mdl;
TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n",
code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb );
@ -847,7 +848,16 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device,
case METHOD_IN_DIRECT: case METHOD_IN_DIRECT:
case METHOD_OUT_DIRECT: case METHOD_OUT_DIRECT:
irp->AssociatedIrp.SystemBuffer = in_buff; irp->AssociatedIrp.SystemBuffer = in_buff;
IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp );
mdl = IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp );
if (!mdl)
{
IoFreeIrp( irp );
return NULL;
}
mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA;
mdl->MappedSystemVa = out_buff;
break; break;
case METHOD_NEITHER: case METHOD_NEITHER:
irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff;
@ -882,7 +892,19 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device,
irpsp->CompletionRoutine = NULL; irpsp->CompletionRoutine = NULL;
irp->AssociatedIrp.SystemBuffer = buffer; irp->AssociatedIrp.SystemBuffer = buffer;
if (device->Flags & DO_DIRECT_IO) IoAllocateMdl( buffer, length, FALSE, FALSE, irp );
if (device->Flags & DO_DIRECT_IO)
{
MDL *mdl = IoAllocateMdl( buffer, length, FALSE, FALSE, irp );
if (!mdl)
{
IoFreeIrp( irp );
return NULL;
}
mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA;
mdl->MappedSystemVa = buffer;
}
switch (majorfunc) switch (majorfunc)
{ {

9
include/ddk/wdm.h
View File

@ -1306,8 +1306,17 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS);
PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);
PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T);
void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);
PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG);
MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority)
{
if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL))
return mdl->MappedSystemVa;
else
return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority);
}
void WINAPI ObDereferenceObject(void*); void WINAPI ObDereferenceObject(void*);
NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION);
NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);