WCHAR Buff[11];
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
+
+ NDIS_DbgPrint(MID_TRACE, ("Parameter type: %d\n", ParameterValue->ParameterType));
/* reset parameter type to standard reg types */
switch(ParameterValue->ParameterType)
*Status = NDIS_STATUS_SUCCESS;
}
+UCHAR UnicodeToHexByte(WCHAR chr)
+/*
+ * FUNCTION: Converts a unicode hex character to its numerical value
+ * ARGUMENTS:
+ * chr: Unicode character to convert
+ * RETURNS:
+ * The numerical value of chr
+ */
+{
+ switch(chr)
+ {
+ case L'0': return 0;
+ case L'1': return 1;
+ case L'2': return 2;
+ case L'3': return 3;
+ case L'4': return 4;
+ case L'5': return 5;
+ case L'6': return 6;
+ case L'7': return 7;
+ case L'8': return 8;
+ case L'9': return 9;
+ case L'A':
+ case L'a':
+ return 10;
+ case L'B':
+ case L'b':
+ return 11;
+ case L'C':
+ case L'c':
+ return 12;
+ case L'D':
+ case L'd':
+ return 13;
+ case L'E':
+ case L'e':
+ return 14;
+ case L'F':
+ case L'f':
+ return 15;
+ }
+ return 0xFF;
+}
+
+BOOLEAN
+IsValidNumericString(PNDIS_STRING String, ULONG Base)
+/*
+ * FUNCTION: Determines if a string is a valid number
+ * ARGUMENTS:
+ * String: Unicode string to evaluate
+ * RETURNS:
+ * TRUE if it is valid, FALSE if not
+ */
+{
+ ULONG i;
+
+ /* I don't think this will ever happen, but we warn it if it does */
+ if (String->Length == 0)
+ {
+ NDIS_DbgPrint(MIN_TRACE, ("Got an empty string; not sure what to do here\n"));
+ return FALSE;
+ }
+
+ for (i = 0; i < String->Length / sizeof(WCHAR); i++)
+ {
+ /* Skip any NULL characters we find */
+ if (String->Buffer[i] == UNICODE_NULL)
+ continue;
+
+ /* Make sure the character is valid for a numeric string of this base */
+ if (UnicodeToHexByte(String->Buffer[i]) >= Base)
+ return FALSE;
+ }
+
+ /* It's valid */
+ return TRUE;
+}
/*
* @implemented
PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle;
PVOID Buffer;
- *ParameterValue = NULL;
+ //*ParameterValue = NULL;
*Status = NDIS_STATUS_FAILURE;
NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword));
+ NDIS_DbgPrint(MID_TRACE,("requested parameter type: %d\n", ParameterType));
if (ConfigurationContext == NULL)
{
return;
}
- if(
- !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) &&
- wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR)
- )
+ if(!wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) &&
+ wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR))
{
*ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER));
if(!*ParameterValue)
return;
}
- if(
- !wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) &&
- wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR)
- )
+ if(!wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) &&
+ wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR))
{
*ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER));
if(!*ParameterValue)
return;
}
- if(
- !wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) &&
- wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR)
- )
+ if(!wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) &&
+ wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR))
{
*ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER));
if(!*ParameterValue)
*Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, NULL, 0, &KeyDataLength);
if(*Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_SUCCESS)
{
- NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status));
+ NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status));
*Status = NDIS_STATUS_FAILURE;
return;
}
(*ParameterValue)->ParameterType = NdisParameterBinary;
- Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength);
+ Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength);
if (!Buffer)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
(*ParameterValue)->ParameterType = NdisParameterMultiString;
- Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength);
+ Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength);
if (!Buffer)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
(*ParameterValue)->ParameterData.StringData.Buffer = Buffer;
(*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength;
}
- else
+ else if (KeyInformation->Type == REG_SZ)
{
UNICODE_STRING str;
+ ULONG Base;
+
+ if (ParameterType == NdisParameterInteger)
+ Base = 10;
+ else if (ParameterType == NdisParameterHexInteger)
+ Base = 16;
+ else
+ Base = 0;
str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength;
str.Buffer = (PWCHAR)KeyInformation->Data;
- if ((*Status = RtlUnicodeStringToInteger(&str, 0,
- &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS)
+ if (Base != 0 && IsValidNumericString(&str, Base))
{
- NDIS_DbgPrint(MAX_TRACE, ("NdisParameterInteger\n"));
+ *Status = RtlUnicodeStringToInteger(&str, Base, &(*ParameterValue)->ParameterData.IntegerData);
+ ASSERT(*Status == STATUS_SUCCESS);
+ NDIS_DbgPrint(MAX_TRACE, ("NdisParameter(Hex)Integer\n"));
+
+ /* MSDN documents that this is returned for all integers, regardless of the ParameterType passed in */
(*ParameterValue)->ParameterType = NdisParameterInteger;
}
else
(*ParameterValue)->ParameterType = NdisParameterString;
- Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength);
+ Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength);
if (!Buffer)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
(*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength;
}
}
+ else
+ {
+ NDIS_DbgPrint(MIN_TRACE, ("Invalid type for NdisReadConfiguration (%d)\n", KeyInformation->Type));
+ NDIS_DbgPrint(MIN_TRACE, ("Requested type: %d\n", ParameterType));
+ NDIS_DbgPrint(MIN_TRACE, ("Registry entry: %wZ\n", Keyword));
+ *Status = NDIS_STATUS_FAILURE;
+ ExFreePool(KeyInformation);
+ return;
+ }
+
+ if (((*ParameterValue)->ParameterType != ParameterType) &&
+ !((ParameterType == NdisParameterHexInteger) && ((*ParameterValue)->ParameterType == NdisParameterInteger)))
+ {
+ NDIS_DbgPrint(MIN_TRACE, ("Parameter type mismatch! (Requested: %d | Received: %d)\n",
+ ParameterType, (*ParameterValue)->ParameterType));
+ NDIS_DbgPrint(MIN_TRACE, ("Registry entry: %wZ\n", Keyword));
+ }
MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;
MiniportResource->Resource = *ParameterValue;
*Status = NDIS_STATUS_SUCCESS;
}
-
-UCHAR UnicodeToHexByte(WCHAR chr)
-/*
- * FUNCTION: Converts a unicode hex character to its numerical value
- * ARGUMENTS:
- * chr: Unicode character to convert
- * RETURNS:
- * The numerical value of chr
- */
-{
- switch(chr)
- {
- case L'0': return 0;
- case L'1': return 1;
- case L'2': return 2;
- case L'3': return 3;
- case L'4': return 4;
- case L'5': return 5;
- case L'6': return 6;
- case L'7': return 7;
- case L'8': return 8;
- case L'9': return 9;
- case L'A':
- case L'a':
- return 10;
- case L'B':
- case L'b':
- return 11;
- case L'C':
- case L'c':
- return 12;
- case L'D':
- case L'd':
- return 13;
- case L'E':
- case L'e':
- return 14;
- case L'F':
- case L'f':
- return 15;
- }
- return -1;
-}
-
-
/*
* @implemented
*/
NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString);
if(*Status != NDIS_STATUS_SUCCESS)
{
- NDIS_DbgPrint(MIN_TRACE, ("NdisReadConfiguration failed (%x)\n", *Status));
+ NDIS_DbgPrint(MID_TRACE, ("NdisReadConfiguration failed (%x)\n", *Status));
*Status = NDIS_STATUS_FAILURE;
return;
}
projects / reactos.git / blobdiff