[PATCH 0/1] MR5330: server: Check for DELETE access in NtMakeTemporaryObject().

[Jinoh Kang (＠iamahuman)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5330

[PATCH 1/1] server: Check for DELETE access in NtMakeTemporaryObject().

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 dlls/ntdll/tests/om.c | 1 -
 server/handle.c       | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 3f416f75f0f..4b166441295 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -3321,7 +3321,6 @@ static void test_object_permanence(void)
                 ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess );
 
             status = NtMakeTemporaryObject( handle );
-            todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED)
             ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status );
             if (!NT_ERROR(status)) is_permanent = FALSE;
         }
diff --git a/server/handle.c b/server/handle.c
index 02a5a22edd1..ef243e06e0b 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -887,9 +887,10 @@ DECL_HANDLER(get_system_handles)
 
 DECL_HANDLER(set_object_permanence)
 {
+    const unsigned int access = req->permanent ? 0 : DELETE;
     struct object *obj;
 
-    if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return;
+    if (!(obj = get_handle_obj( current->process, req->handle, access, NULL ))) return;
 
     if (req->permanent && !obj->is_permanent)
     {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5330

[PATCH 1/1] server: Check for DELETE access in NtMakeTemporaryObject().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144116

Your paranoid android.


=== debian11b (64 bit WoW report) ===

dinput:
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:747: Test failed: 0x800: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: 0x800: WaitForSingleObject returned 0x102
hid.c:722: Test failed: 0x800: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:3860: Test failed: CreateFile succeeded
hid.c:3871: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:3874: Test failed: WaitForSingleObject returned 0x102
hid.c:3876: Test failed: WaitForSingleObject returned 0x102
hid.c:3880: Test failed: Failed to find HID device matching L"\\\\?\\hid#vid_1209&pid_0001"
hid.c:3883: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:3887: Test failed: WaitForSingleObject returned 0x102
hid.c:3889: Test failed: WaitForSingleObject returned 0x102
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:747: Test failed: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: WaitForSingleObject returned 0x102
hid.c:722: Test failed: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:747: Test failed: 0x500: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: 0x500: WaitForSingleObject returned 0x102
hid.c:722: Test failed: 0x500: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0
hid.c:747: Test failed: 0x800: desc[0]: IOCTL_WINETEST_CREATE_DEVICE failed, last error 1
hid.c:751: Test failed: 0x800: desc[0]: WaitForSingleObject returned 0x102
hid.c:722: Test failed: 0x800: desc[0]: IOCTL_WINETEST_REMOVE_DEVICE failed, last error 1
hid.c:498: Test failed: expected failure
hid.c:499: Test failed: got error 0

kernel32:
volume.c:152: Test failed: failed to remove drive a:, error 5
volume.c:155: Test failed: expected failure
volume.c:156: Test failed: got error 5
volume.c:167: Test failed: failed to define drive a:, error 183
volume.c:185: Test failed: failed to remove drive a:, error 5
volume.c:188: Test failed: expected failure
volume.c:189: Test failed: got error 5

ntoskrnl.exe:
driver.c:2294: Test failed: got 0xc0000022
driver.c:2296: Test failed: got 0xc0000022
driver.c:2300: Test failed: got 0
driver.c:2303: Test failed: got 0xc0000035
driver.c:2310: Test failed: got 0xc0000008
driver.c:2313: Test failed: got 0
ntoskrnl.c:1528: Test failed: got error 1
ntoskrnl.c:1540: Test failed: got error 1
ntoskrnl.c:1546: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1559: Test failed: got error 1
ntoskrnl.c:1569: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1571: Test failed: got flags 0
ntoskrnl.c:1575: Test failed: got error 1
ntoskrnl.c:1585: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1601: Test failed: got error 1
ntoskrnl.c:1630: Test succeeded inside todo block: expected failure
ntoskrnl.c:1636: Test failed: got error 0x6
ntoskrnl.c:1644: Test failed: got error 0x6
ntoskrnl.c:1649: Test failed: got error 0x6
ntoskrnl.c:1653: Test failed: got error 0x6
ntoskrnl.c:1655: Test failed: got size 200
ntoskrnl.c:1656: Test failed: got hardware IDs "ROOT\\WINETEST\\0\x00etest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}\x00\x00\x00\x00$\x00\x00\x00\x00\x00D\xf2!\x00\x00\x00\x00\x00@\xf2!\x00\x00\x00\x00\x00v\xaa\xc6\xff\xffo\x00\x00p\x10A\x00\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\xd0\xcb\xb6\x00\x00\x00\x00\x00\x00\xf0!\x00#\x00\x00"...
ntoskrnl.c:1661: Test failed: got error 0x6
ntoskrnl.c:1663: Test failed: got size 400
ntoskrnl.c:1664: Test failed: got container ID L"\000e\0010"
ntoskrnl.c:1668: Test failed: got error 0x6
ntoskrnl.c:1670: Test failed: got size 200
ntoskrnl.c:1671: Test failed: got compatible IDs "ROOT\\WINETEST\\0\x00etest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}\x00\x00\x00\x00$\x00\x00\x00\x00\x00D\xf2!\x00\x00\x00\x00\x00@\xf2!\x00\x00\x00\x00\x00v\xaa\xc6\xff\xffo\x00\x00p\x10A\x00\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\xd0\xcb\xb6\x00\x00\x00\x00\x00\x00\xf0!\x00#\x00\x00"...
ntoskrnl.c:1684: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1686: Test failed: got flags 0
ntoskrnl.c:1690: Test failed: failed to get interface path, error 0x57
ntoskrnl.c:1691: Test failed: wrong path "\\WINETEST\\0"
ntoskrnl.c:1705: Test failed: got size 200
ntoskrnl.c:1715: Test failed: got size 200
ntoskrnl.c:1719: Test failed: got error 1
ntoskrnl.c:1734: Test failed: got size 200
ntoskrnl.c:1848: Test failed: got error 0