*/
/*
* PROJECT: ReactOS kernel
- * FILE: ntoskrnl/dbg/kdb_cli.c
+ * FILE: ntoskrnl/kdbg/kdb_cli.c
* PURPOSE: Kernel debugger command line interface
* PROGRAMMER: Gregor Anich (blight@blight.eu.org)
* Hervé Poussineau
static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]);
static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]);
+static BOOLEAN KdbpCmdReboot(ULONG Argc, PCHAR Argv[]);
static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]);
static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]);
static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]);
/* Others */
{ NULL, NULL, "Others", NULL },
{ "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck },
+ { "reboot", "reboot", "Reboots the system.", KdbpCmdReboot},
{ "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter },
{ "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet },
{ "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg },
}
ComponentTable[] =
{
- { "DEFAULT", DPFLTR_DEFAULT_ID },
+ { "DEFAULT", MAXULONG },
{ "SYSTEM", DPFLTR_SYSTEM_ID },
{ "SMSS", DPFLTR_SMSS_ID },
{ "SETUP", DPFLTR_SETUP_ID },
return FALSE;
}
+static BOOLEAN
+KdbpCmdReboot(
+ ULONG Argc,
+ PCHAR Argv[])
+{
+ /* Reboot immediately (we do not return) */
+ HalReturnToFirmware(HalRebootRoutine);
+ return FALSE;
+}
+
+
VOID
KdbpPager(
IN PCHAR Buffer,
* call this function if KdbInitFileBuffer is not NULL.
*/
VOID
-KdbpCliInterpretInitFile()
+KdbpCliInterpretInitFile(VOID)
{
PCHAR p1, p2;
INT i;
/*!\brief Called when KDB is initialized
*
- * Reads the KDBinit file from the SystemRoot\system32\drivers\etc directory and executes it.
+ * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory and executes it.
*/
VOID
-KdbpCliInit()
+KdbpCliInit(VOID)
{
NTSTATUS Status;
OBJECT_ATTRIBUTES ObjectAttributes;
ULONG OldEflags;
/* Initialize the object attributes */
- RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDBinit");
+ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\drivers\\etc\\KDBinit");
InitializeObjectAttributes(&ObjectAttributes, &FileName, 0, NULL, NULL);
/* Open the file */
FILE_NO_INTERMEDIATE_BUFFERING);
if (!NT_SUCCESS(Status))
{
- DPRINT("Could not open \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status);
+ DPRINT("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status);
return;
}
if (!NT_SUCCESS(Status))
{
ZwClose(hFile);
- DPRINT("Could not query size of \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status);
+ DPRINT("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status);
return;
}
FileSize = FileStdInfo.EndOfFile.u.LowPart;
}
/* Load file into memory */
- Status = ZwReadFile(hFile, 0, 0, 0, &Iosb, FileBuffer, FileSize, 0, 0);
+ Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL);
ZwClose(hFile);
if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE)
ULONG
NTAPI
-KdpPrompt(IN LPSTR InString,
- IN USHORT InStringLength,
- OUT LPSTR OutString,
- IN USHORT OutStringLength)
+KdpPrompt(
+ _In_reads_bytes_(InStringLength) PCHAR UnsafeInString,
+ _In_ USHORT InStringLength,
+ _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString,
+ _In_ USHORT OutStringLength,
+ _In_ KPROCESSOR_MODE PreviousMode)
{
USHORT i;
CHAR Response;
ULONG DummyScanCode;
KIRQL OldIrql;
+ PCHAR InString;
+ PCHAR OutString;
+
+ /* Normalize the lengths */
+ InStringLength = min(InStringLength,
+ 512);
+ OutStringLength = min(OutStringLength,
+ 512);
+
+ /* Check if we need to verify the string */
+ if (PreviousMode != KernelMode)
+ {
+ /* Handle user-mode buffers safely */
+ _SEH2_TRY
+ {
+ /* Probe the prompt */
+ ProbeForRead(UnsafeInString,
+ InStringLength,
+ 1);
+
+ /* Capture prompt */
+ InString = _alloca(InStringLength);
+ RtlCopyMemory(InString,
+ UnsafeInString,
+ InStringLength);
+
+ /* Probe and make room for response */
+ ProbeForWrite(UnsafeOutString,
+ OutStringLength,
+ 1);
+ OutString = _alloca(OutStringLength);
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ /* Bad string pointer, bail out */
+ _SEH2_YIELD(return 0);
+ }
+ _SEH2_END;
+ }
+ else
+ {
+ InString = UnsafeInString;
+ OutString = UnsafeOutString;
+ }
/* Acquire the printing spinlock without waiting at raised IRQL */
while (TRUE)
* DbgPrompt does not null terminate, but it does
*/
*(PCHAR)(OutString + i) = 0;
-
- /* Print a new line */
- KdPortPutByteEx(&SerialPortInfo, '\r');
- KdPortPutByteEx(&SerialPortInfo, '\n');
-
- /* Release spinlock */
- KiReleaseSpinLock(&KdpSerialSpinLock);
-
- /* Lower IRQL back */
- KeLowerIrql(OldIrql);
-
- /* Return the length */
- return OutStringLength + 1;
+ break;
}
/* Write it back and print it to the log */
/* Lower IRQL back */
KeLowerIrql(OldIrql);
+ /* Copy back response if required */
+ if (PreviousMode != KernelMode)
+ {
+ _SEH2_TRY
+ {
+ /* Safely copy back response to user mode */
+ RtlCopyMemory(UnsafeOutString,
+ OutString,
+ i);
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ /* String became invalid after we exited, fail */
+ _SEH2_YIELD(return 0);
+ }
+ _SEH2_END;
+ }
+
/* Return the length */
- return OutStringLength;
+ return i;
}