Re: [PATCH v8 2/4] ntdll/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior

[Huw Davies]

On Thu, Jun 06, 2019 at 05:17:44PM +0200, Rémi Bernon wrote:
> The zero_bits parameter doesn't behave as expected, and some 64bit code
> use it to allocate memory in the lower 32bit address space.
>
> The expected full behaviour is:
> - zero_bits == 0: no constraint on address range
> - 0 < zero_bits <= 15: returned address should have as many upper bits
>                      set to 0, starting at bit 31. In 64bit mode,
>                      upper 32bits should all be 0 as well.
> - 15 < zero_bits <= 31: unsure, but probably same as zero_bits == 15.
> - zero_bits > 31: (64bit/WoW64 only) zero_bits behaves as a bitmask, as
>                 if it was set to the number of leading 0 in the
>                 bitmask, works in the whole 64bit range.
> Signed-off-by: Rémi Bernon
>
> dlls/ntdll/tests/virtual.c | 77 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 77 insertions(+)
>
> diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
> index 21dd57e8de5..050fb20c87f 100644
> --- a/dlls/ntdll/tests/virtual.c
> +++ b/dlls/ntdll/tests/virtual.c
> @@ -26,11 +26,15 @@
>  #include "winternl.h"
>  #include "wine/test.h"
>
> +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
> -
>
> static void test_AllocateVirtualMemory(void)
>  {
>      void *addr1, *addr2;
>      NTSTATUS status;
>      SIZE_T size;
> -
>
> ULONG zero_bits;
> -
>
> BOOL is_wow64;
>
> /* simple allocation should success */
> size = 0x1000;
>
> @@ -60,6 +64,46 @@ static void test_AllocateVirtualMemory(void)
>          ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
>      }
> - /* 1 zero bits should zero 63-31 upper bits */
> - size = 0x1000;
> - addr2 = NULL;
> - zero_bits = 1;
> - status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 1, &size,
> -
>                                 MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
> - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY ||
> -
>   broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */,
> -
>   "NtAllocateVirtualMemory returned %08x\n", status);
> - if (status == STATUS_SUCCESS)
> - {
> -
>    ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
> -
>       "NtAllocateVirtualMemory returned address: %p\n", addr2);
> -
> -
>    size = 0;
> -
>    status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE);
> -
>    ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
> - }
> -
> - for (zero_bits = 2; zero_bits <= 20; zero_bits++)
> - {
> -
>    size = 0x1000;
> -
>    addr2 = NULL;
> -
>    status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, zero_bits, &size,
> -
>                                     MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
> -
>    ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY ||
> -
>       broken(zero_bits == 20 && status == STATUS_CONFLICTING_ADDRESSES) /* w1064v1809 */,
> -
>       "NtAllocateVirtualMemory with %d zero_bits returned %08x\n", zero_bits, status);
> -
>    if (status == STATUS_SUCCESS)
> -
>    {
> -
>        todo_wine_if(zero_bits >= 12 || ((UINT_PTR)addr2 >> (32 - zero_bits)))
> -
>        ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
> -
>           "NtAllocateVirtualMemory with %d zero_bits returned address %p\n", zero_bits, status);

This had a typo here (status should be addr2)

I've sent in a new version of this patch and the previous one.

Huw.