Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 09:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bugs with vim

Browse source 
svn path=/trunk/; revision=2377
This commit is contained in:
David Welch 2001-11-18 00:31:24 +00:00
parent 5d289c12b2
commit 189a5e8404
2 changed files with 94 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

90
reactos/ntoskrnl/ex/sysinfo.c
View file

@ -1,4 +1,4 @@
/* $Id: sysinfo.c,v 1.13 2001/09/02 17:29:51 dwelch Exp $ /* $Id: sysinfo.c,v 1.14 2001/11/18 00:31:23 dwelch Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1013,54 +1013,76 @@ CallQS [] =
}; };
NTSTATUS NTSTATUS STDCALL
STDCALL NtQuerySystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
NtQuerySystemInformation ( OUT PVOID UnsafeSystemInformation,
IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
OUT PVOID SystemInformation,
IN ULONG Length, IN ULONG Length,
OUT PULONG ResultLength OUT PULONG UnsafeResultLength)
)
{ {
/* ULONG ResultLength;
* If called from user mode, check PVOID SystemInformation;
* possible unsafe arguments. NTSTATUS Status;
*/ NTSTATUS FStatus;
#if 0
if (KernelMode != KeGetPreviousMode()) if (ExGetPreviousMode() == KernelMode)
{ {
// Check arguments SystemInformation = UnsafeSystemInformation;
//ProbeForWrite(
// SystemInformation,
// Length
// );
//ProbeForWrite(
// ResultLength,
// sizeof (ULONG)
// );
} }
#endif else
/* {
* Clear the user buffer. SystemInformation = ExAllocatePool(NonPagedPool, Length);
*/ if (SystemInformation == NULL)
{
return(STATUS_NO_MEMORY);
}
}
/* Clear user buffer. */
RtlZeroMemory(SystemInformation, Length); RtlZeroMemory(SystemInformation, Length);
/* /*
* Check the request is valid. * Check the request is valid.
*/ */
if ( (SystemInformationClass >= SystemInformationClassMin) if ((SystemInformationClass >= SystemInformationClassMin) &&
&& (SystemInformationClass < SystemInformationClassMax) (SystemInformationClass < SystemInformationClassMax))
)
{ {
if (NULL != CallQS [SystemInformationClass].Query) if (NULL != CallQS [SystemInformationClass].Query)
{ {
/* /*
* Hand the request to a subhandler. * Hand the request to a subhandler.
*/ */
return CallQS [SystemInformationClass].Query ( FStatus = CallQS [SystemInformationClass].Query(SystemInformation,
SystemInformation,
Length, Length,
ResultLength &ResultLength);
); if (ExGetPreviousMode() != KernelMode)
{
Status = MmCopyToCaller(UnsafeSystemInformation,
SystemInformation,
Length);
ExFreePool(SystemInformation);
if (!NT_SUCCESS(Status))
{
return(Status);
}
}
if (UnsafeResultLength != NULL)
{
if (ExGetPreviousMode() == KernelMode)
{
*UnsafeResultLength = ResultLength;
}
else
{
Status = MmCopyToCaller(UnsafeResultLength,
&ResultLength,
sizeof(ULONG));
if (!NT_SUCCESS(Status))
{
return(Status);
}
}
}
return(FStatus);
} }
} }
return (STATUS_INVALID_INFO_CLASS); return (STATUS_INVALID_INFO_CLASS);

25
reactos/ntoskrnl/ke/i386/exp.c
View file

@ -38,6 +38,7 @@
#include <internal/ps.h> #include <internal/ps.h>
#include <internal/trap.h> #include <internal/trap.h>
#include <ntdll/ldr.h> #include <ntdll/ldr.h>
#include <internal/safe.h>
#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
@ -368,6 +369,9 @@ KiUserTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2)
PULONG Frame; PULONG Frame;
ULONG cr3; ULONG cr3;
ULONG i; ULONG i;
ULONG ReturnAddress;
ULONG NextFrame;
NTSTATUS Status;
/* /*
* Get the PDBR * Get the PDBR
@ -452,8 +456,25 @@ KiUserTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2)
Frame = (PULONG)Tf->Ebp; Frame = (PULONG)Tf->Ebp;
while (Frame != NULL) while (Frame != NULL)
{ {
print_address((PVOID)Frame[1]); Status = MmCopyToCaller(&ReturnAddress, &Frame[1], sizeof(ULONG));
Frame = (PULONG)Frame[0]; if (!NT_SUCCESS(Status))
{
DbgPrint("????????\n");
break;
}
print_address((PVOID)ReturnAddress);
Status = MmCopyToCaller(&NextFrame, &Frame[0], sizeof(ULONG));
if (!NT_SUCCESS(Status))
{
DbgPrint("Frame is inaccessible.\n");
break;
}
if ((NextFrame + sizeof(ULONG)) >= KERNEL_BASE)
{
DbgPrint("Next frame is in kernel space!\n");
break;
}
Frame = (PULONG)NextFrame;
i++; i++;
} }