Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32] Improve handling of unaligned key name in RegOpenKeyExW

Browse source 
Check for unaligned buffer before calling NtOpenKey instead of checking the result for STATUS_DATATYPE_MISALIGNMENT.
This commit is contained in:
Timo Kreuzer 2023-10-22 21:42:11 +03:00
parent f95c789f2b
commit aff1666356
1 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
dll/win32/advapi32/reg/reg.c
View file

@ -3362,6 +3362,7 @@ RegOpenKeyExW(HKEY hKey,
NTSTATUS Status;
ULONG Attributes = OBJ_CASE_INSENSITIVE;
LONG ErrorCode = ERROR_SUCCESS;
BOOLEAN SubKeyStringAllocated = FALSE;
TRACE("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n",
hKey, lpSubKey, ulOptions, samDesired, phkResult);
@ -3398,10 +3399,31 @@ RegOpenKeyExW(HKEY hKey,
Attributes |= OBJ_OPENLINK;
if (lpSubKey == NULL || wcscmp(lpSubKey, L"\\") == 0)
{
RtlInitUnicodeString(&SubKeyString, L"");
}
else
{
RtlInitUnicodeString(&SubKeyString, lpSubKey);
/* Handle unaligned lpSubKey */
if ((ULONG_PTR)lpSubKey & 1)
{
UNICODE_STRING AlignedString;
Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE,
&SubKeyString,
&AlignedString);
if (!NT_SUCCESS(Status))
{
goto Exit;
}
SubKeyString = AlignedString;
SubKeyStringAllocated = TRUE;
}
}
InitializeObjectAttributes(&ObjectAttributes,
&SubKeyString,
Attributes,
@ -3412,37 +3434,11 @@ RegOpenKeyExW(HKEY hKey,
samDesired,
&ObjectAttributes);
if (Status == STATUS_DATATYPE_MISALIGNMENT)
Exit:
if (SubKeyStringAllocated)
{
HANDLE hAligned;
UNICODE_STRING AlignedString;
Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE,
&SubKeyString,
&AlignedString);
if (NT_SUCCESS(Status))
{
/* Try again with aligned parameters */
InitializeObjectAttributes(&ObjectAttributes,
&AlignedString,
Attributes,
KeyHandle,
NULL);
Status = NtOpenKey(&hAligned,
samDesired,
&ObjectAttributes);
RtlFreeUnicodeString(&AlignedString);
if (NT_SUCCESS(Status))
*phkResult = hAligned;
}
else
{
/* Restore the original error */
Status = STATUS_DATATYPE_MISALIGNMENT;
}
RtlFreeUnicodeString(&SubKeyString);
}
if (!NT_SUCCESS(Status))
@ -3450,7 +3446,6 @@ RegOpenKeyExW(HKEY hKey,
ErrorCode = RtlNtStatusToDosError(Status);
}
ClosePredefKey(KeyHandle);
return ErrorCode;