Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/39: [WINESYNC] Add wininet entry
by Jérôme Gardou 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f997acf8e3564727a72cd… commit f997acf8e3564727a72cda37901469dce7b75f9c Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 8 17:28:07 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Jan 5 11:03:13 2021 +0100 [WINESYNC] Add wininet entry --- sdk/tools/winesync/wininet.cfg | 8 + ...-wininet-tests-Add-more-tests-for-cookies.patch | 145 +++++++++++++ ...ts-Test-auth-credential-reusage-with-host.patch | 130 +++++++++++ ...ts-Check-cookie-behaviour-when-overriding.patch | 132 +++++++++++ ...trip-filename-if-no-path-is-set-in-cookie.patch | 82 +++++++ ...lacing-header-fields-should-fail-if-they-.patch | 241 +++++++++++++++++++++ 6 files changed, 738 insertions(+) diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg new file mode 100644 index 00000000000..41556140139 --- /dev/null +++ b/sdk/tools/winesync/wininet.cfg @@ -0,0 +1,8 @@ +directories: + dlls/wininet: dll/win32/wininet + dlls/wininet/tests: modules/rostests/winetests/wininet +files: + include/wininet.h: sdk/include/psdk/wininet.h + include/winineti.h: sdk/include/psdk/winineti.h +tags: + wine: wine-4.18 diff --git a/sdk/tools/winesync/wininet_staging/0001-wininet-tests-Add-more-tests-for-cookies.patch b/sdk/tools/winesync/wininet_staging/0001-wininet-tests-Add-more-tests-for-cookies.patch new file mode 100644 index 00000000000..110d815705a --- /dev/null +++ b/sdk/tools/winesync/wininet_staging/0001-wininet-tests-Add-more-tests-for-cookies.patch @@ -0,0 +1,145 @@ +From 915a805cabaec3cc265f4f8ad9f0005502f8fd24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael(a)fds-team.de> +Date: Fri, 15 May 2015 20:37:19 +0200 +Subject: [PATCH] wininet/tests: Add more tests for cookies. + +--- + modules/rostests/winetests/wininet/http.c | 92 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 89 insertions(+), 3 deletions(-) + +diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c +index 90a38dc3a..55d51b299 100644 +--- a/modules/rostests/winetests/wininet/http.c ++++ b/modules/rostests/winetests/wininet/http.c +@@ -2068,6 +2068,14 @@ static const char largemsg[] = + "Content-Length: %I64u\r\n" + "\r\n"; + ++static const char okmsg_cookie_path[] = ++"HTTP/1.1 200 OK\r\n" ++"Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" ++"Server: winetest\r\n" ++"Content-Length: 0\r\n" ++"Set-Cookie: subcookie2=data; path=/test_cookie_set_path\r\n" ++"\r\n"; ++ + static const char notokmsg[] = + "HTTP/1.1 400 Bad Request\r\n" + "Server: winetest\r\n" +@@ -2438,6 +2446,32 @@ static DWORD CALLBACK server_thread(LPVOID param) + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } ++ if (strstr(buffer, "/test_cookie_path1")) ++ { ++ if (strstr(buffer, "subcookie=data")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, notokmsg, sizeof notokmsg-1, 0); ++ } ++ if (strstr(buffer, "/test_cookie_path2")) ++ { ++ if (strstr(buffer, "subcookie2=data")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, notokmsg, sizeof notokmsg-1, 0); ++ } ++ if (strstr(buffer, "/test_cookie_set_path")) ++ { ++ send(c, okmsg_cookie_path, sizeof okmsg_cookie_path-1, 0); ++ } ++ if (strstr(buffer, "/test_cookie_merge")) ++ { ++ if (strstr(buffer, "subcookie=data") && ++ !strstr(buffer, "manual_cookie=test")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, notokmsg, sizeof notokmsg-1, 0); ++ } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) +@@ -3816,7 +3850,7 @@ static void test_cookie_header(int port) + HINTERNET ses, con, req; + DWORD size, error; + BOOL ret; +- char buffer[64]; ++ char buffer[256]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); +@@ -3844,7 +3878,7 @@ static void test_cookie_header(int port) + size = sizeof(buffer); + ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); +- ok(!strcmp(buffer, "cookie=not biscuit"), "got '%s' expected \'cookie=not biscuit\'\n", buffer); ++ ok(!!strstr(buffer, "cookie=not biscuit"), "got '%s' expected \'cookie=not biscuit\'\n", buffer); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); +@@ -3855,9 +3889,61 @@ static void test_cookie_header(int port) + size = sizeof(buffer); + ret = HttpQueryInfoA(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); +- ok(!strcmp(buffer, "cookie=biscuit"), "got '%s' expected \'cookie=biscuit\'\n", buffer); ++ ok(!strstr(buffer, "cookie=not biscuit"), "'%s' should not contain \'cookie=not biscuit\'\n", buffer); ++ ok(!!strstr(buffer, "cookie=biscuit"), "'%s' should contain \'cookie=biscuit\'\n", buffer); ++ ++ InternetCloseHandle(req); ++ ++ InternetSetCookieA("http://localhost/testCCCC", "subcookie", "data"); ++ ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_path1", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ InternetCloseHandle(req); ++ ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_path1/abc", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ InternetCloseHandle(req); ++ ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_set_path", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ InternetCloseHandle(req); ++ ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_path2", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); + ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 400); + InternetCloseHandle(req); ++ ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_merge", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpAddRequestHeadersA(req, "Cookie: manual_cookie=test\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed: %u\n", GetLastError()); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ InternetCloseHandle(req); ++ + InternetCloseHandle(con); + InternetCloseHandle(ses); + } +-- +2.23.0 + diff --git a/sdk/tools/winesync/wininet_staging/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch b/sdk/tools/winesync/wininet_staging/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch new file mode 100644 index 00000000000..f24048f8b82 --- /dev/null +++ b/sdk/tools/winesync/wininet_staging/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch @@ -0,0 +1,130 @@ +From 303a7d54eca11f350f200bf3747646349a84536f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael(a)fds-team.de> +Date: Fri, 15 May 2015 21:18:37 +0200 +Subject: [PATCH] wininet/tests: Test auth credential reusage with host + override. + +--- + modules/rostests/winetests/wininet/http.c | 93 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 93 insertions(+) + +diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c +index b06bd6c04d1..59689baf87e 100644 +--- a/modules/rostests/winetests/wininet/http.c ++++ b/modules/rostests/winetests/wininet/http.c +@@ -2496,12 +2496,27 @@ static DWORD CALLBACK server_thread(LPVOID param) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + } ++ + if (strstr(buffer, "HEAD /test_large_content")) + { + char msg[sizeof(largemsg) + 16]; + sprintf(msg, largemsg, content_length); + send(c, msg, strlen(msg), 0); + } ++ if (strstr(buffer, "HEAD /test_auth_host1")) ++ { ++ if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzcw==")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, noauthmsg, sizeof noauthmsg-1, 0); ++ } ++ if (strstr(buffer, "HEAD /test_auth_host2")) ++ { ++ if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzczI=")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, noauthmsg, sizeof noauthmsg-1, 0); ++ } + shutdown(c, 2); + closesocket(c); + c = -1; +@@ -3200,6 +3215,84 @@ static void test_header_override(int port) + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); ++ ++ ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ++ ok(ses != NULL, "InternetOpenA failed\n"); ++ ++ con = InternetConnectA(ses, "localhost", port, "test1", "pass", INTERNET_SERVICE_HTTP, 0, 0); ++ ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); ++ ++ req = HttpOpenRequestA( con, "HEAD", "/test_auth_host1", NULL, NULL, NULL, 0, 0); ++ ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ InternetCloseHandle(con); ++ InternetCloseHandle(ses); ++ ++ ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ++ ok(ses != NULL, "InternetOpenA failed\n"); ++ ++ con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ++ ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); ++ ++ req = HttpOpenRequestA(con, "HEAD", "/test_auth_host1", NULL, NULL, NULL, 0, 0); ++ ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ++ ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ InternetCloseHandle(con); ++ InternetCloseHandle(ses); ++ ++ ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ++ ok(ses != NULL, "InternetOpenA failed\n"); ++ ++ con = InternetConnectA(ses, "localhost", port, "test1", "pass2", INTERNET_SERVICE_HTTP, 0, 0); ++ ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); ++ ++ req = HttpOpenRequestA(con, "HEAD", "/test_auth_host2", NULL, NULL, NULL, 0, 0); ++ ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ InternetCloseHandle(con); ++ InternetCloseHandle(ses); ++ ++ ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ++ ok(ses != NULL, "InternetOpenA failed\n"); ++ ++ con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ++ ok(con != NULL, "InternetConnectA failed %u\n", GetLastError()); ++ ++ req = HttpOpenRequestA(con, "HEAD", "/test_auth_host2", NULL, NULL, NULL, 0, 0); ++ ok(req != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ InternetCloseHandle(con); ++ InternetCloseHandle(ses); + } + + static void test_connection_closing(int port) +-- +2.17.1 + diff --git a/sdk/tools/winesync/wininet_staging/0003-wininet-tests-Check-cookie-behaviour-when-overriding.patch b/sdk/tools/winesync/wininet_staging/0003-wininet-tests-Check-cookie-behaviour-when-overriding.patch new file mode 100644 index 00000000000..4aa7802cb67 --- /dev/null +++ b/sdk/tools/winesync/wininet_staging/0003-wininet-tests-Check-cookie-behaviour-when-overriding.patch @@ -0,0 +1,132 @@ +From 21ca3efb2a8a1f505f9e3f3ed2126a766d4a127f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael(a)fds-team.de> +Date: Fri, 15 May 2015 23:09:20 +0200 +Subject: wininet/tests: Check cookie behaviour when overriding host. + +--- + modules/rostests/winetests/wininet/http.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 95 insertions(+) + +diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c +index 546e473..0121aa5 100644 +--- a/modules/rostests/winetests/wininet/http.c ++++ b/modules/rostests/winetests/wininet/http.c +@@ -2000,6 +2000,14 @@ static const char okmsg_cookie_path[] = + "Set-Cookie: subcookie2=data; path=/test_cookie_set_path\r\n" + "\r\n"; + ++static const char okmsg_cookie[] = ++"HTTP/1.1 200 OK\r\n" ++"Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" ++"Server: winetest\r\n" ++"Content-Length: 0\r\n" ++"Set-Cookie: testcookie=testvalue\r\n" ++"\r\n"; ++ + static const char notokmsg[] = + "HTTP/1.1 400 Bad Request\r\n" + "Server: winetest\r\n" +@@ -2391,6 +2399,25 @@ static DWORD CALLBACK server_thread(LPVOID param) + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } ++ if (strstr(buffer, "/test_cookie_set_host_override")) ++ { ++ send(c, okmsg_cookie, sizeof okmsg_cookie-1, 0); ++ } ++ if (strstr(buffer, "/test_cookie_check_host_override")) ++ { ++ if (strstr(buffer, "Cookie:") && strstr(buffer, "testcookie=testvalue")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, notokmsg, sizeof notokmsg-1, 0); ++ } ++ if (strstr(buffer, "/test_cookie_check_different_host")) ++ { ++ if (!strstr(buffer, "foo") && ++ strstr(buffer, "cookie=biscuit")) ++ send(c, okmsg, sizeof okmsg-1, 0); ++ else ++ send(c, notokmsg, sizeof notokmsg-1, 0); ++ } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) +@@ -3130,6 +3157,74 @@ static void test_header_override(int port) + } + + InternetCloseHandle(req); ++ InternetSetCookieA("http://localhost", "cookie", "biscuit"); ++ req = HttpOpenRequestA(con, NULL, "/testC", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_set_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code_todo(req, 200); ++ ++ InternetCloseHandle(req); ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code_todo(req, 200); ++ ++ InternetCloseHandle(req); ++ InternetSetCookieA("http://test.local", "foo", "bar"); ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_check_different_host", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); ++ req = HttpOpenRequestA(con, NULL, "/test_cookie_check_different_host", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); ++ ok(req != NULL, "HttpOpenRequest failed\n"); ++ ++ ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); ++ ok(ret, "HttpAddRequestHeaders failed\n"); ++ ++ ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ++ ok(ret, "HttpSendRequest failed\n"); ++ ++ test_status_code(req, 200); ++ ++ InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + +-- +2.8.0 + diff --git a/sdk/tools/winesync/wininet_staging/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch b/sdk/tools/winesync/wininet_staging/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch new file mode 100644 index 00000000000..7d4dbf3888d --- /dev/null +++ b/sdk/tools/winesync/wininet_staging/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch @@ -0,0 +1,82 @@ +From a283ad7a863862caf312843950b88bdfd9faeacc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael(a)fds-team.de> +Date: Sat, 16 May 2015 00:24:35 +0200 +Subject: wininet: Strip filename if no path is set in cookie. + +The order of the stored cookies doesn't match in /testC, so +be a bit less strict in the test. +--- + dll/win32/wininet/http.c | 11 ++++++++++- + modules/rostests/winetests/wininet/http.c | 6 +++--- + 2 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/dll/win32/wininet/http.c b/dll/win32/wininet/http.c +index c44156c..7281512 100644 +--- a/dll/win32/wininet/http.c ++++ b/dll/win32/wininet/http.c +@@ -764,10 +764,18 @@ static void HTTP_ProcessCookies( http_request_t *request ) + int HeaderIndex; + int numCookies = 0; + LPHTTPHEADERW setCookieHeader; ++ WCHAR *path, *tmp; + + if(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) + return; + ++ path = heap_strdupW(request->path); ++ if (!path) ++ return; ++ ++ tmp = strrchrW(path, '/'); ++ if (tmp && tmp[1]) tmp[1] = 0; ++ + EnterCriticalSection( &request->headers_section ); + + while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1) +@@ -786,10 +794,11 @@ static void HTTP_ProcessCookies( http_request_t *request ) + + name = substr(setCookieHeader->lpszValue, data - setCookieHeader->lpszValue); + data++; +- set_cookie(substrz(request->server->name), substrz(request->path), name, substrz(data), INTERNET_COOKIE_HTTPONLY); ++ set_cookie(substrz(request->server->name), substrz(path), name, substrz(data), INTERNET_COOKIE_HTTPONLY); + } + + LeaveCriticalSection( &request->headers_section ); ++ heap_free(path); + } + + static void strip_spaces(LPWSTR start) +diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c +index b3826bb..910a0b4 100644 +--- a/modules/rostests/winetests/wininet/http.c ++++ b/modules/rostests/winetests/wininet/http.c +@@ -2226,7 +2226,7 @@ static DWORD CALLBACK server_thread(LPVOID param) + } + if (strstr(buffer, "/testC")) + { +- if (strstr(buffer, "Cookie: cookie=biscuit")) ++ if (strstr(buffer, "cookie=biscuit")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); +@@ -3196,7 +3196,7 @@ static void test_header_override(int port) + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + +- test_status_code_todo(req, 200); ++ test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_cookie_check_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); +@@ -3205,7 +3205,7 @@ static void test_header_override(int port) + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + +- test_status_code_todo(req, 200); ++ test_status_code(req, 200); + + InternetCloseHandle(req); + InternetSetCookieA("http://test.local", "foo", "bar"); +-- +2.8.0 + diff --git a/sdk/tools/winesync/wininet_staging/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch b/sdk/tools/winesync/wininet_staging/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch new file mode 100644 index 00000000000..74f59297d72 --- /dev/null +++ b/sdk/tools/winesync/wininet_staging/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch @@ -0,0 +1,241 @@ +From 0b022db2f23f61313004bdf0e2e42e9fd9b2f81d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael(a)fds-team.de> +Date: Sat, 16 May 2015 03:16:15 +0200 +Subject: wininet: Replacing header fields should fail if they do not exist + yet. + +A lot of details are not properly covered by tests yet and were +marked with FIXME comments. The implementation was written in such +a way that it behaves identical to the old code in such situations. +--- + dll/win32/wininet/http.c | 185 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 93 insertions(+), 92 deletions(-) + +diff --git a/dll/win32/wininet/http.c b/dll/win32/wininet/http.c +index 6f01244..5419786 100644 +--- a/dll/win32/wininet/http.c ++++ b/dll/win32/wininet/http.c +@@ -6166,127 +6166,128 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) + + static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) + { +- LPHTTPHEADERW lphttpHdr = NULL; ++ LPHTTPHEADERW lphttpHdr; + INT index; + BOOL request_only = !!(dwModifier & HTTP_ADDHDR_FLAG_REQ); +- DWORD res = ERROR_HTTP_INVALID_HEADER; ++ DWORD res = ERROR_SUCCESS; + + TRACE("--> %s: %s - 0x%08x\n", debugstr_w(field), debugstr_w(value), dwModifier); + + EnterCriticalSection( &request->headers_section ); + +- /* REPLACE wins out over ADD */ +- if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) +- dwModifier &= ~HTTP_ADDHDR_FLAG_ADD; +- +- if (dwModifier & HTTP_ADDHDR_FLAG_ADD) +- index = -1; +- else +- index = HTTP_GetCustomHeaderIndex(request, field, 0, request_only); +- ++ index = HTTP_GetCustomHeaderIndex(request, field, 0, request_only); + if (index >= 0) + { +- if (dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW) +- { +- LeaveCriticalSection( &request->headers_section ); +- return ERROR_HTTP_INVALID_HEADER; +- } + lphttpHdr = &request->custHeaders[index]; +- } +- else if (value) +- { +- HTTPHEADERW hdr; + +- hdr.lpszField = (LPWSTR)field; +- hdr.lpszValue = (LPWSTR)value; +- hdr.wFlags = hdr.wCount = 0; ++ /* replace existing header if FLAG_REPLACE is given */ ++ if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) ++ { ++ HTTP_DeleteCustomHeader( request, index ); + +- if (dwModifier & HTTP_ADDHDR_FLAG_REQ) +- hdr.wFlags |= HDR_ISREQUEST; ++ if (value && value[0]) ++ { ++ HTTPHEADERW hdr; + +- res = HTTP_InsertCustomHeader(request, &hdr); +- LeaveCriticalSection( &request->headers_section ); +- return res; +- } +- /* no value to delete */ +- else +- { +- LeaveCriticalSection( &request->headers_section ); +- return ERROR_SUCCESS; +- } ++ hdr.lpszField = (LPWSTR)field; ++ hdr.lpszValue = (LPWSTR)value; ++ hdr.wFlags = hdr.wCount = 0; + +- if (dwModifier & HTTP_ADDHDR_FLAG_REQ) +- lphttpHdr->wFlags |= HDR_ISREQUEST; +- else +- lphttpHdr->wFlags &= ~HDR_ISREQUEST; ++ if (dwModifier & HTTP_ADDHDR_FLAG_REQ) ++ hdr.wFlags |= HDR_ISREQUEST; + +- if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) +- { +- HTTP_DeleteCustomHeader( request, index ); ++ res = HTTP_InsertCustomHeader( request, &hdr ); ++ } + +- if (value && value[0]) ++ goto out; ++ } ++ ++ /* do not add new header if FLAG_ADD_IF_NEW is set */ ++ if (dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW) + { +- HTTPHEADERW hdr; ++ res = ERROR_HTTP_INVALID_HEADER; /* FIXME */ ++ goto out; ++ } + +- hdr.lpszField = (LPWSTR)field; +- hdr.lpszValue = (LPWSTR)value; +- hdr.wFlags = hdr.wCount = 0; ++ /* handle appending to existing header */ ++ if (dwModifier & COALESCEFLAGS) ++ { ++ LPWSTR lpsztmp; ++ WCHAR ch = 0; ++ INT len = 0; ++ INT origlen = strlenW(lphttpHdr->lpszValue); ++ INT valuelen = strlenW(value); + ++ /* FIXME: Should it really clear HDR_ISREQUEST? */ + if (dwModifier & HTTP_ADDHDR_FLAG_REQ) +- hdr.wFlags |= HDR_ISREQUEST; +- +- res = HTTP_InsertCustomHeader(request, &hdr); +- LeaveCriticalSection( &request->headers_section ); +- return res; +- } ++ lphttpHdr->wFlags |= HDR_ISREQUEST; ++ else ++ lphttpHdr->wFlags &= ~HDR_ISREQUEST; + +- LeaveCriticalSection( &request->headers_section ); +- return ERROR_SUCCESS; +- } +- else if (dwModifier & COALESCEFLAGS) +- { +- LPWSTR lpsztmp; +- WCHAR ch = 0; +- INT len = 0; +- INT origlen = strlenW(lphttpHdr->lpszValue); +- INT valuelen = strlenW(value); ++ if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA) ++ { ++ ch = ','; ++ lphttpHdr->wFlags |= HDR_COMMADELIMITED; ++ } ++ else if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) ++ { ++ ch = ';'; ++ lphttpHdr->wFlags |= HDR_COMMADELIMITED; ++ } + +- if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA) +- { +- ch = ','; +- lphttpHdr->wFlags |= HDR_COMMADELIMITED; +- } +- else if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +- { +- ch = ';'; +- lphttpHdr->wFlags |= HDR_COMMADELIMITED; +- } ++ len = origlen + valuelen + ((ch > 0) ? 2 : 0); + +- len = origlen + valuelen + ((ch > 0) ? 2 : 0); ++ lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); ++ if (lpsztmp) ++ { ++ lphttpHdr->lpszValue = lpsztmp; ++ /* FIXME: Increment lphttpHdr->wCount. Perhaps lpszValue should be an array */ ++ if (ch > 0) ++ { ++ lphttpHdr->lpszValue[origlen] = ch; ++ origlen++; ++ lphttpHdr->lpszValue[origlen] = ' '; ++ origlen++; ++ } + +- lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); +- if (lpsztmp) +- { +- lphttpHdr->lpszValue = lpsztmp; +- /* FIXME: Increment lphttpHdr->wCount. Perhaps lpszValue should be an array */ +- if (ch > 0) ++ memcpy(&lphttpHdr->lpszValue[origlen], value, valuelen*sizeof(WCHAR)); ++ lphttpHdr->lpszValue[len] = '\0'; ++ } ++ else + { +- lphttpHdr->lpszValue[origlen] = ch; +- origlen++; +- lphttpHdr->lpszValue[origlen] = ' '; +- origlen++; ++ WARN("heap_realloc (%d bytes) failed\n",len+1); ++ res = ERROR_OUTOFMEMORY; + } + +- memcpy(&lphttpHdr->lpszValue[origlen], value, valuelen*sizeof(WCHAR)); +- lphttpHdr->lpszValue[len] = '\0'; +- res = ERROR_SUCCESS; +- } +- else +- { +- WARN("heap_realloc (%d bytes) failed\n",len+1); +- res = ERROR_OUTOFMEMORY; ++ goto out; + } + } ++ ++ /* FIXME: What about other combinations? */ ++ if ((dwModifier & ~HTTP_ADDHDR_FLAG_REQ) == HTTP_ADDHDR_FLAG_REPLACE) ++ { ++ res = ERROR_HTTP_HEADER_NOT_FOUND; ++ goto out; ++ } ++ ++ /* FIXME: What if value == ""? */ ++ if (value) ++ { ++ HTTPHEADERW hdr; ++ ++ hdr.lpszField = (LPWSTR)field; ++ hdr.lpszValue = (LPWSTR)value; ++ hdr.wFlags = hdr.wCount = 0; ++ ++ if (dwModifier & HTTP_ADDHDR_FLAG_REQ) ++ hdr.wFlags |= HDR_ISREQUEST; ++ ++ res = HTTP_InsertCustomHeader( request, &hdr ); ++ goto out; ++ } ++ ++ /* FIXME: What if value == NULL? */ ++out: + TRACE("<-- %d\n", res); + LeaveCriticalSection( &request->headers_section ); + return res; +-- +2.8.0 +

1 0

[reactos] 01/01: [UNIATA] Fix one of INF sections that made device unrecognized
by Stanislav Motylkov 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cf363feb146d40228a50… commit 8cf363feb146d40228a5048ea204ad9ea0fc1112 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jan 5 02:58:04 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 5 02:58:04 2021 +0300 [UNIATA] Fix one of INF sections that made device unrecognized In fact, UniATA todo.txt file mentions it implicitly: - 159.fix bug with invalid INF section under XP+ (43e2) CORE-17398 --- drivers/storage/ide/uniata/uniata_comm.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/ide/uniata/uniata_comm.inf b/drivers/storage/ide/uniata/uniata_comm.inf index 12ea786cbf5..afdebae4028 100644 --- a/drivers/storage/ide/uniata/uniata_comm.inf +++ b/drivers/storage/ide/uniata/uniata_comm.inf @@ -54,7 +54,7 @@ uniata.sys ; [uniata_Inst.Services] -AddService = +AddService = , 0x00000002 ; ; Source file information

1 0

[reactos] 01/01: [USETUP] Partial revert of 8b94515b for the ESCAPE key in the UpgradeRepairPage() screen.
by Hermès Bélusca-Maïto 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68182b2a52858eb0011df… commit 68182b2a52858eb0011df1467444e66e0b056f74 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 4 16:11:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 4 16:13:28 2021 +0100 [USETUP] Partial revert of 8b94515b for the ESCAPE key in the UpgradeRepairPage() screen. The AsciiChar of the ESCAPE key should be 0x1B instead of zero; however this is not the case due to the hacked keyboard layout currently being used. This will be fixed later ... --- base/setup/usetup/usetup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index ea09d5dd9af..898b5790f65 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1050,8 +1050,26 @@ UpgradeRepairPage(PINPUT_RECORD Ir) RedrawGenericList(&ListUi); break; } +#if 1 +/* TODO: Temporarily kept until correct keyboard layout is in place. + * (Actual AsciiChar of ESCAPE should be 0x1B instead of 0.) + * Addendum to commit 8b94515b. + */ + case VK_ESCAPE: /* ESC */ + { + RestoreGenericListUiState(&ListUi); + // return nextPage; // prevPage; + + // return INSTALL_INTRO_PAGE; + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + } + +#endif } } +#if 0 +/* TODO: Restore this once correct keyboard layout is in place. */ else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ { RestoreGenericListUiState(&ListUi); @@ -1061,6 +1079,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir) return DEVICE_SETTINGS_PAGE; // return SCSI_CONTROLLER_PAGE; } +#endif else { // switch (toupper(Ir->Event.KeyEvent.uChar.AsciiChar))

1 0

[reactos] 01/01: [I8042PRT][RAMDISK] Fix usage of the RegistryPath in DriverEntry
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06bff99edbcc87d1e54ec… commit 06bff99edbcc87d1e54ec3bb2017588c187cacee Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jan 4 17:19:12 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 17:19:12 2021 +0300 [I8042PRT][RAMDISK] Fix usage of the RegistryPath in DriverEntry We can't rely on it being zero-terminated, so ensure that it's duplicated first before usage in RtlQueryRegistryValues --- drivers/input/i8042prt/i8042prt.c | 2 +- drivers/storage/class/ramdisk/ramdisk.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/input/i8042prt/i8042prt.c b/drivers/input/i8042prt/i8042prt.c index 879c231d80f..67106a6e70c 100644 --- a/drivers/input/i8042prt/i8042prt.c +++ b/drivers/input/i8042prt/i8042prt.c @@ -511,7 +511,7 @@ DriverEntry( return Status; } - Status = ReadRegistryEntries(RegistryPath, &DriverExtension->Port.Settings); + Status = ReadRegistryEntries(&DriverExtension->RegistryPath, &DriverExtension->Port.Settings); if (!NT_SUCCESS(Status)) { WARN_(I8042PRT, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); diff --git a/drivers/storage/class/ramdisk/ramdisk.c b/drivers/storage/class/ramdisk/ramdisk.c index 987d0ffc6fd..8a05a7065af 100644 --- a/drivers/storage/class/ramdisk/ramdisk.c +++ b/drivers/storage/class/ramdisk/ramdisk.c @@ -2419,18 +2419,20 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, NTSTATUS Status; DPRINT("RAM Disk Driver Initialized\n"); - /* Query ramdisk parameters */ - QueryParameters(RegistryPath); - /* Save the registry path */ - DriverRegistryPath = *RegistryPath; + DriverRegistryPath.MaximumLength = RegistryPath->Length + sizeof(UNICODE_NULL); DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, - RegistryPath->Length + - sizeof(UNICODE_NULL), + DriverRegistryPath.MaximumLength, 'dmaR'); - if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + if (!DriverRegistryPath.Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); + /* Query ramdisk parameters */ + QueryParameters(&DriverRegistryPath); + /* Set device routines */ DriverObject->MajorFunction[IRP_MJ_CREATE] = RamdiskOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = RamdiskOpenClose;

1 0

[reactos] 10/10: [USETUP] Do not put ImagePath to the service registry entry
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e12233daf62010f940135… commit e12233daf62010f940135c397c17300999cd9ae3 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 22 21:00:38 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:33 2021 +0300 [USETUP] Do not put ImagePath to the service registry entry It is supposed to be there already --- base/setup/usetup/devinst.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index 5e5f4404f05..81eb382f5fb 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -63,10 +63,8 @@ InstallDriver( IN LPCWSTR DeviceId, IN LPCWSTR HardwareId) { - UNICODE_STRING PathPrefix = RTL_CONSTANT_STRING(L"System32\\DRIVERS\\"); UNICODE_STRING ServiceU = RTL_CONSTANT_STRING(L"Service"); UNICODE_STRING ErrorControlU = RTL_CONSTANT_STRING(L"ErrorControl"); - UNICODE_STRING ImagePathU = RTL_CONSTANT_STRING(L"ImagePath"); UNICODE_STRING StartU = RTL_CONSTANT_STRING(L"Start"); UNICODE_STRING TypeU = RTL_CONSTANT_STRING(L"Type"); UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); @@ -78,7 +76,6 @@ InstallDriver( HANDLE hService; INFCONTEXT Context; PCWSTR Driver, ClassGuid, ImagePath; - PWSTR FullImagePath; ULONG dwValue; ULONG Disposition; NTSTATUS Status; @@ -114,20 +111,6 @@ InstallDriver( return FALSE; } - /* Prepare full driver path */ - dwValue = PathPrefix.MaximumLength + wcslen(ImagePath) * sizeof(WCHAR); - FullImagePath = (PWSTR)RtlAllocateHeap(ProcessHeap, 0, dwValue); - if (!FullImagePath) - { - DPRINT1("RtlAllocateHeap() failed\n"); - INF_FreeData(ImagePath); - INF_FreeData(ClassGuid); - INF_FreeData(Driver); - return FALSE; - } - RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); - ConcatPaths(FullImagePath, dwValue / sizeof(WCHAR), 1, ImagePath); - DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); /* Create service key */ @@ -137,7 +120,6 @@ InstallDriver( if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey('%wZ') failed with status 0x%08x\n", &StringU, Status); - RtlFreeHeap(ProcessHeap, 0, FullImagePath); INF_FreeData(ImagePath); INF_FreeData(ClassGuid); INF_FreeData(Driver); @@ -171,15 +153,9 @@ InstallDriver( &dwValue, sizeof(dwValue)); } - /* HACK: don't put any path in registry */ - NtSetValueKey(hService, - &ImagePathU, - 0, - REG_SZ, - (PVOID)ImagePath, - (wcslen(ImagePath) + 1) * sizeof(WCHAR)); INF_FreeData(ImagePath); + NtClose(hService); /* Add kbdclass and partmgr upper filters */ if (ClassGuid &&_wcsicmp(ClassGuid, L"{4D36E96B-E325-11CE-BFC1-08002BE10318}") == 0) @@ -220,17 +196,6 @@ InstallDriver( INF_FreeData(Driver); - /* HACK: Update driver path */ - NtSetValueKey(hService, - &ImagePathU, - 0, - REG_SZ, - FullImagePath, - (wcslen(FullImagePath) + 1) * sizeof(WCHAR)); - RtlFreeHeap(ProcessHeap, 0, FullImagePath); - - NtClose(hService); - return deviceInstalled; }

1 0

[reactos] 09/10: [NTOS:IO] Start loading drivers from the disk only after SystemRoot is initialized
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5254974d22199c52766f… commit e5254974d22199c52766f5de43233c842020d7e9 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 22 20:52:20 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:33 2021 +0300 [NTOS:IO] Start loading drivers from the disk only after SystemRoot is initialized Add another PnPBootDriversInitialized variable to indicate a point where both disk subsystem and SystemRoot symlink are initialized, and use it in a PiCallDriverAddDevice call. --- ntoskrnl/io/iomgr/iomgr.c | 5 +++++ ntoskrnl/io/pnpmgr/devaction.c | 3 ++- ntoskrnl/io/pnpmgr/pnpinit.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index d7dc1bcb8c4..5d272cb8af7 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -77,6 +77,7 @@ extern KSPIN_LOCK IopLogListLock; extern KSPIN_LOCK IopTimerLock; extern PDEVICE_OBJECT IopErrorLogObject; +extern BOOLEAN PnPBootDriversInitialized; GENERAL_LOOKASIDE IoLargeIrpLookaside; GENERAL_LOOKASIDE IoSmallIrpLookaside; @@ -583,6 +584,10 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } + // the disk subsystem is initialized here and the SystemRoot is set too + // we can finally load other drivers from the boot volume + PnPBootDriversInitialized = TRUE; + #if !defined(_WINKD_) && defined(KDBG) /* Read KDB Data */ KdbInit(); diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 12f3e443c30..8b4db9d387a 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -35,6 +35,7 @@ extern ERESOURCE IopDriverLoadResource; extern BOOLEAN PnpSystemInit; extern PDEVICE_NODE IopRootDeviceNode; extern BOOLEAN PnPBootDriversLoaded; +extern BOOLEAN PnPBootDriversInitialized; #define MAX_DEVICE_ID_LEN 200 #define MAX_SEPARATORS_INSTANCEID 0 @@ -1560,7 +1561,7 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) return STATUS_SUCCESS; - PiCallDriverAddDevice(DeviceNode, PnPBootDriversLoaded); + PiCallDriverAddDevice(DeviceNode, PnPBootDriversInitialized); return STATUS_SUCCESS; } diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index e32c11e930d..0667fd72785 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -24,6 +24,7 @@ PUNICODE_STRING PiInitGroupOrderTable; USHORT PiInitGroupOrderTableCount; INTERFACE_TYPE PnpDefaultInterfaceType; BOOLEAN PnPBootDriversLoaded = FALSE; +BOOLEAN PnPBootDriversInitialized = FALSE; ARBITER_INSTANCE IopRootBusNumberArbiter; ARBITER_INSTANCE IopRootIrqArbiter;

1 0

[reactos] 08/10: [NTOS:IO][NTOS:PNP] Implement PiCallDriverAddDevice
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4c0585f96a2a8642d231… commit c4c0585f96a2a8642d2319e17b4bb834f2b943b7 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Nov 26 04:39:38 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:33 2021 +0300 [NTOS:IO][NTOS:PNP] Implement PiCallDriverAddDevice - Move the driver's name obtaining logic into the IopGetDriverNames function - Create a new PiCallDriverAddDevice instead of PipCallDriverAddDevice and move it to pnpmgr/devaction.c file. Move around all its internal helpers too - Support a proper Windows-compatible driver loading order for a PDO (lower filters, main service, upper filters, etc.) - Set a correct Problem for the DeviceNode, in case of an error during driver loading - Check the Start Type for all drivers before loading - Do not try to load drivers during the early boot stage when there is no disk subsystem initialized --- ntoskrnl/include/internal/io.h | 46 ++- ntoskrnl/io/iomgr/driver.c | 603 ++++++++------------------------------- ntoskrnl/io/pnpmgr/devaction.c | 630 ++++++++++++++++++++++++++++++++++------- ntoskrnl/io/pnpmgr/devnode.c | 17 ++ ntoskrnl/io/pnpmgr/pnpinit.c | 139 --------- ntoskrnl/io/pnpmgr/pnpmgr.c | 69 ----- 6 files changed, 673 insertions(+), 831 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index ad51265ba3f..65005373bd2 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -568,12 +568,9 @@ IopDetectResourceConflict( // PNP Routines // NTSTATUS -NTAPI -PipCallDriverAddDevice( - IN PDEVICE_NODE DeviceNode, - IN BOOLEAN LoadDriver, - IN PDRIVER_OBJECT DriverObject -); +PiCallDriverAddDevice( + _In_ PDEVICE_NODE DeviceNode, + _In_ BOOLEAN LoadDrivers); NTSTATUS NTAPI @@ -612,6 +609,15 @@ PiInsertDevNode( _In_ PDEVICE_NODE DeviceNode, _In_ PDEVICE_NODE ParentNode); +VOID +PiSetDevNodeProblem( + _In_ PDEVICE_NODE DeviceNode, + _In_ UINT32 Problem); + +VOID +PiClearDevNodeProblem( + _In_ PDEVICE_NODE DeviceNode); + NTSTATUS IopFreeDeviceNode( IN PDEVICE_NODE DeviceNode @@ -811,13 +817,6 @@ IopReadyDeviceObjects( IN PDRIVER_OBJECT Driver ); -NTSTATUS -FASTCALL -IopInitializeDevice( - IN PDEVICE_NODE DeviceNode, - IN PDRIVER_OBJECT DriverObject -); - NTSTATUS IopStartDevice( IN PDEVICE_NODE DeviceNode @@ -1110,26 +1109,17 @@ IopDeleteDriver( IN PVOID ObjectBody ); -NTSTATUS -FASTCALL -IopGetDriverObject( - OUT PDRIVER_OBJECT *DriverObject, - IN PUNICODE_STRING ServiceName, - IN BOOLEAN FileSystem -); - -NTSTATUS -FASTCALL -IopLoadServiceModule( - IN PUNICODE_STRING ServiceName, - OUT PLDR_DATA_TABLE_ENTRY *ModuleObject -); - NTSTATUS IopLoadDriver( _In_ HANDLE ServiceHandle, _Out_ PDRIVER_OBJECT *DriverObject); +NTSTATUS +IopGetDriverNames( + _In_ HANDLE ServiceHandle, + _Out_ PUNICODE_STRING DriverName, + _Out_opt_ PUNICODE_STRING ServiceName); + NTSTATUS IopInitializeDriverModule( _In_ PLDR_DATA_TABLE_ENTRY ModuleObject, diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 994d7375af8..1e02c1cc213 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -122,64 +122,127 @@ IopDeleteDriver(IN PVOID ObjectBody) } NTSTATUS -FASTCALL -IopGetDriverObject( - PDRIVER_OBJECT *DriverObject, - PUNICODE_STRING ServiceName, - BOOLEAN FileSystem) +IopGetDriverNames( + _In_ HANDLE ServiceHandle, + _Out_ PUNICODE_STRING DriverName, + _Out_opt_ PUNICODE_STRING ServiceName) { - PDRIVER_OBJECT Object; - UNICODE_STRING Prefix; - UNICODE_STRING DriverName; - NTSTATUS Status; + UNICODE_STRING driverName = {.Buffer = NULL}, serviceName; + PKEY_VALUE_FULL_INFORMATION kvInfo; + NTSTATUS status; - DPRINT("IopGetDriverObject(%p '%wZ' %x)\n", - DriverObject, ServiceName, FileSystem); + PAGED_CODE(); - *DriverObject = NULL; + // 1. Check the "ObjectName" field in the driver's registry key (it has the priority) + status = IopGetRegistryValue(ServiceHandle, L"ObjectName", &kvInfo); + if (NT_SUCCESS(status)) + { + // we're got the ObjectName. Use it to create the DRIVER_OBJECT + if (kvInfo->Type != REG_SZ || kvInfo->DataLength == 0) + { + ExFreePool(kvInfo); + return STATUS_ILL_FORMED_SERVICE_ENTRY; + } - /* Create ModuleName string */ - if (ServiceName == NULL || ServiceName->Buffer == NULL) - /* We don't know which DriverObject we have to open */ - return STATUS_INVALID_PARAMETER_2; + driverName.Length = kvInfo->DataLength - sizeof(WCHAR), + driverName.MaximumLength = kvInfo->DataLength, + driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); + if (!driverName.Buffer) + { + ExFreePool(kvInfo); + return STATUS_INSUFFICIENT_RESOURCES; + } - if (FileSystem != FALSE) - RtlInitUnicodeString(&Prefix, FILESYSTEM_ROOT_NAME); - else - RtlInitUnicodeString(&Prefix, DRIVER_ROOT_NAME); + RtlMoveMemory(driverName.Buffer, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + driverName.Length); + ExFreePool(kvInfo); + } - DriverName.Length = 0; - DriverName.MaximumLength = Prefix.Length + ServiceName->Length + sizeof(UNICODE_NULL); - ASSERT(DriverName.MaximumLength > ServiceName->Length); - DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, DriverName.MaximumLength, TAG_IO); - if (DriverName.Buffer == NULL) + // check if we need to get ServiceName as well + PKEY_BASIC_INFORMATION basicInfo; + if (!NT_SUCCESS(status) || ServiceName != NULL) { - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlAppendUnicodeStringToString(&DriverName, &Prefix); - RtlAppendUnicodeStringToString(&DriverName, ServiceName); + ULONG infoLength; + status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); + if (status == STATUS_BUFFER_TOO_SMALL) + { + basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); + if (!basicInfo) + { + return STATUS_INSUFFICIENT_RESOURCES; + } - DPRINT("Driver name: '%wZ'\n", &DriverName); + status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); + if (!NT_SUCCESS(status)) + { + ExFreePoolWithTag(basicInfo, TAG_IO); + return status; + } - /* Open driver object */ - Status = ObReferenceObjectByName(&DriverName, - OBJ_OPENIF | OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, /* Attributes */ - NULL, /* PassedAccessState */ - 0, /* DesiredAccess */ - IoDriverObjectType, - KernelMode, - NULL, /* ParseContext */ - (PVOID*)&Object); - ExFreePoolWithTag(DriverName.Buffer, TAG_IO); - if (!NT_SUCCESS(Status)) + serviceName.Length = basicInfo->NameLength; + serviceName.MaximumLength = basicInfo->NameLength; + serviceName.Buffer = basicInfo->Name; + } + else + { + return NT_SUCCESS(status) ? STATUS_UNSUCCESSFUL : status; + } + } + + // 2. there is no "ObjectName" - construct it ourselves. Depending on a driver type, + // it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" + if (driverName.Buffer == NULL) { - DPRINT("Failed to reference driver object, status=0x%08x\n", Status); - return Status; + status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); + if (!NT_SUCCESS(status) || kvInfo->Type != REG_DWORD) + { + ExFreePool(kvInfo); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName + return STATUS_ILL_FORMED_SERVICE_ENTRY; + } + + UINT32 driverType; + RtlMoveMemory(&driverType, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), sizeof(UINT32)); + ExFreePool(kvInfo); + + driverName.Length = 0; + if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) + driverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + serviceName.Length; + else + driverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + serviceName.Length; + driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); + if (!driverName.Buffer) + { + ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) + RtlAppendUnicodeToString(&driverName, FILESYSTEM_ROOT_NAME); + else + RtlAppendUnicodeToString(&driverName, DRIVER_ROOT_NAME); + + RtlAppendUnicodeStringToString(&driverName, &serviceName); } - *DriverObject = Object; + if (ServiceName) + { + PWCHAR buf = ExAllocatePoolWithTag(PagedPool, serviceName.Length, TAG_IO); + if (!buf) + { + ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName + ExFreePoolWithTag(driverName.Buffer, TAG_IO); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlMoveMemory(buf, serviceName.Buffer, serviceName.Length); + ServiceName->MaximumLength = serviceName.Length; + ServiceName->Length = serviceName.Length; + ServiceName->Buffer = buf; + } + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName - DPRINT("Driver Object: %p\n", Object); + *DriverName = driverName; return STATUS_SUCCESS; } @@ -317,162 +380,6 @@ IopNormalizeImagePath( return STATUS_SUCCESS; } -NTSTATUS -IopQueryServiceSettings( - _In_ PUNICODE_STRING ServiceName, - _Out_ PUNICODE_STRING ServiceImagePath, - _Out_ PULONG ServiceStart) -{ - NTSTATUS Status; - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - UNICODE_STRING CCSName = RTL_CONSTANT_STRING( - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - HANDLE CCSKey, ServiceKey; - - /* Open CurrentControlSet */ - Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &CCSName, Status); - return Status; - } - - /* Open service key */ - Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - ServiceName, Status); - ZwClose(CCSKey); - return Status; - } - - /* - * Get information about the service. - */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - - RtlInitUnicodeString(ServiceImagePath, NULL); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = ServiceStart; - - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = ServiceImagePath; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, - (PWSTR)ServiceKey, - QueryTable, - NULL, - NULL); - - ZwClose(ServiceKey); - ZwClose(CCSKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlQueryRegistryValues() failed for '%wZ' (Status %lx)\n", ServiceName, Status); - return Status; - } - - return Status; -} - -/* - * IopLoadServiceModule - * - * Load a module specified by registry settings for service. - * - * Parameters - * ServiceName - * Name of the service to load. - * - * Return Value - * Status - */ -NTSTATUS -FASTCALL -IopLoadServiceModule( - IN PUNICODE_STRING ServiceName, - OUT PLDR_DATA_TABLE_ENTRY *ModuleObject) -{ - ULONG ServiceStart; - UNICODE_STRING ServiceImagePath; - NTSTATUS Status; - PVOID BaseAddress; - - ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); - ASSERT(ServiceName->Length); - DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); - - if (ExpInTextModeSetup) - { - /* We have no registry, but luckily we know where all the drivers are */ - DPRINT1("IopLoadServiceModule(%wZ, 0x%p) called in ExpInTextModeSetup mode...\n", ServiceName, ModuleObject); - - /* ServiceStart < 4 is all that matters */ - ServiceStart = 0; - - /* IopNormalizeImagePath will do all of the work for us if we give it an empty string */ - RtlInitEmptyUnicodeString(&ServiceImagePath, NULL, 0); - } - else - { - Status = IopQueryServiceSettings(ServiceName, &ServiceImagePath, &ServiceStart); - if (!NT_SUCCESS(Status)) - { - DPRINT("IopQueryServiceSettings() failed for '%wZ' (Status %lx)\n", ServiceName, Status); - return Status; - } - } - - /* - * Normalize the image path for all later processing. - */ - Status = IopNormalizeImagePath(&ServiceImagePath, ServiceName); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - return Status; - } - - /* - * Case for disabled drivers - */ - if (ServiceStart >= 4) - { - /* We can't load this */ - Status = STATUS_DRIVER_UNABLE_TO_LOAD; - } - else - { - DPRINT("Loading module from %wZ\n", &ServiceImagePath); - Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, &BaseAddress); - if (NT_SUCCESS(Status)) - { - IopDisplayLoadingMessage(ServiceName); - } - } - - ExFreePool(ServiceImagePath.Buffer); - - /* - * Now check if the module was loaded successfully. - */ - if (!NT_SUCCESS(Status)) - { - DPRINT("Module loading failed (Status %x)\n", Status); - } - - DPRINT("Module loading (Status %x)\n", Status); - - return Status; -} - /** * @brief Initialize a loaded driver * @@ -504,112 +411,18 @@ IopInitializeDriverModule( PAGED_CODE(); - // get the ServiceName - PKEY_BASIC_INFORMATION basicInfo; - ULONG infoLength; - Status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); - if (Status == STATUS_BUFFER_TOO_SMALL) - { - basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); - if (!basicInfo) - { - MmUnloadSystemImage(ModuleObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(basicInfo, TAG_IO); - MmUnloadSystemImage(ModuleObject); - return Status; - } - - ServiceName.Length = basicInfo->NameLength; - ServiceName.MaximumLength = basicInfo->NameLength; - ServiceName.Buffer = basicInfo->Name; - } - else + Status = IopGetDriverNames(ServiceHandle, &DriverName, &ServiceName); + if (!NT_SUCCESS(Status)) { MmUnloadSystemImage(ModuleObject); - return NT_SUCCESS(Status) ? STATUS_UNSUCCESSFUL : Status; - } - - // Make the DriverName field of a DRIVER_OBJECT - PKEY_VALUE_FULL_INFORMATION kvInfo; - - // 1. Check the "ObjectName" field in the driver's registry key (it has the priority) - Status = IopGetRegistryValue(ServiceHandle, L"ObjectName", &kvInfo); - if (NT_SUCCESS(Status)) - { - // we're got the ObjectName. Use it to create the DRIVER_OBJECT - if (kvInfo->Type != REG_SZ || kvInfo->DataLength == 0) - { - ExFreePool(kvInfo); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName - MmUnloadSystemImage(ModuleObject); - return STATUS_ILL_FORMED_SERVICE_ENTRY; - } - - DriverName.Length = kvInfo->DataLength - sizeof(WCHAR), - DriverName.MaximumLength = kvInfo->DataLength, - DriverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DriverName.MaximumLength, TAG_IO); - if (!DriverName.Buffer) - { - ExFreePool(kvInfo); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName - MmUnloadSystemImage(ModuleObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlMoveMemory(DriverName.Buffer, - (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), - DriverName.Length); - ExFreePool(kvInfo); - } - else - { - // 2. there is no "ObjectName" - construct it ourselves. Depending on a driver type, - // it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" - - Status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); - if (!NT_SUCCESS(Status) || kvInfo->Type != REG_DWORD) - { - ExFreePool(kvInfo); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName - MmUnloadSystemImage(ModuleObject); - return STATUS_ILL_FORMED_SERVICE_ENTRY; - } - - UINT32 driverType; - RtlMoveMemory(&driverType, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), sizeof(UINT32)); - ExFreePool(kvInfo); - - DriverName.Length = 0; - if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) - DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName.Length; - else - DriverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + ServiceName.Length; - DriverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DriverName.MaximumLength, TAG_IO); - if (!DriverName.Buffer) - { - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName - MmUnloadSystemImage(ModuleObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) - RtlAppendUnicodeToString(&DriverName, FILESYSTEM_ROOT_NAME); - else - RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); - - RtlAppendUnicodeStringToString(&DriverName, &ServiceName); + return Status; } DPRINT("Driver name: '%wZ'\n", &DriverName); // obtain the registry path for the DriverInit routine PKEY_NAME_INFORMATION nameInfo; + ULONG infoLength; Status = ZwQueryKey(ServiceHandle, KeyNameInformation, NULL, 0, &infoLength); if (Status == STATUS_BUFFER_TOO_SMALL) { @@ -644,7 +457,7 @@ IopInitializeDriverModule( if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); RtlFreeUnicodeString(&DriverName); MmUnloadSystemImage(ModuleObject); return Status; @@ -672,7 +485,7 @@ IopInitializeDriverModule( if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); RtlFreeUnicodeString(&DriverName); MmUnloadSystemImage(ModuleObject); DPRINT1("Error while creating driver object \"%wZ\" status %x\n", &DriverName, Status); @@ -706,7 +519,7 @@ IopInitializeDriverModule( if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(nameInfo, TAG_IO); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); RtlFreeUnicodeString(&DriverName); return Status; } @@ -725,7 +538,7 @@ IopInitializeDriverModule( if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); RtlFreeUnicodeString(&DriverName); return Status; } @@ -743,14 +556,14 @@ IopInitializeDriverModule( ObMakeTemporaryObject(driverObject); ObDereferenceObject(driverObject); ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); RtlFreeUnicodeString(&DriverName); return STATUS_INSUFFICIENT_RESOURCES; } /* Copy the name and set it in the driver extension */ RtlCopyUnicodeString(&serviceKeyName, &ServiceName); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&ServiceName); driverObject->DriverExtension->ServiceKeyName = serviceKeyName; /* Make a copy of the driver name to store in the driver object */ @@ -836,186 +649,6 @@ IopInitializeDriverModule( return STATUS_SUCCESS; } -/* - * IopAttachFilterDriversCallback - * - * Internal routine used by IopAttachFilterDrivers. - */ -NTSTATUS -NTAPI -IopAttachFilterDriversCallback( - PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PDEVICE_NODE DeviceNode = Context; - UNICODE_STRING ServiceName; - PWCHAR Filters; - PLDR_DATA_TABLE_ENTRY ModuleObject; - PDRIVER_OBJECT DriverObject; - NTSTATUS Status; - - /* No filter value present */ - if (ValueType == REG_NONE) - return STATUS_SUCCESS; - - for (Filters = ValueData; - ((ULONG_PTR)Filters - (ULONG_PTR)ValueData) < ValueLength && - *Filters != 0; - Filters += (ServiceName.Length / sizeof(WCHAR)) + 1) - { - DPRINT("Filter Driver: %S (%wZ)\n", Filters, &DeviceNode->InstancePath); - - ServiceName.Buffer = Filters; - ServiceName.MaximumLength = - ServiceName.Length = (USHORT)wcslen(Filters) * sizeof(WCHAR); - - UNICODE_STRING RegistryPath; - - // Make the registry path for the driver - RegistryPath.Length = 0; - RegistryPath.MaximumLength = sizeof(ServicesKeyName) + ServiceName.Length; - RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath.MaximumLength, TAG_IO); - if (RegistryPath.Buffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlAppendUnicodeToString(&RegistryPath, ServicesKeyName); - RtlAppendUnicodeStringToString(&RegistryPath, &ServiceName); - - HANDLE serviceHandle; - Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryPath, KEY_READ); - RtlFreeUnicodeString(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = IopGetDriverObject(&DriverObject, - &ServiceName, - FALSE); - if (!NT_SUCCESS(Status)) - { - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); - - /* Load and initialize the filter driver */ - Status = IopLoadServiceModule(&ServiceName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - ZwClose(serviceHandle); - return Status; - } - - NTSTATUS driverEntryStatus; - Status = IopInitializeDriverModule(ModuleObject, - serviceHandle, - &DriverObject, - &driverEntryStatus); - - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - - if (!NT_SUCCESS(Status)) - { - ZwClose(serviceHandle); - return Status; - } - } - - ZwClose(serviceHandle); - - Status = IopInitializeDevice(DeviceNode, DriverObject); - - /* Remove extra reference */ - ObDereferenceObject(DriverObject); - - if (!NT_SUCCESS(Status)) - return Status; - } - - return STATUS_SUCCESS; -} - -/* - * IopAttachFilterDrivers - * - * Load filter drivers for specified device node. - * - * Parameters - * Lower - * Set to TRUE for loading lower level filters or FALSE for upper - * level filters. - */ -NTSTATUS -FASTCALL -IopAttachFilterDrivers( - PDEVICE_NODE DeviceNode, - HANDLE EnumSubKey, - HANDLE ClassKey, - BOOLEAN Lower) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2] = { { NULL, 0, NULL, NULL, 0, NULL, 0 }, }; - NTSTATUS Status; - - /* - * First load the device filters - */ - QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback; - if (Lower) - QueryTable[0].Name = L"LowerFilters"; - else - QueryTable[0].Name = L"UpperFilters"; - QueryTable[0].Flags = 0; - QueryTable[0].DefaultType = REG_NONE; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, - (PWSTR)EnumSubKey, - QueryTable, - DeviceNode, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to load device %s filters: %08X\n", - Lower ? "lower" : "upper", Status); - return Status; - } - - QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback; - if (Lower) - QueryTable[0].Name = L"LowerFilters"; - else - QueryTable[0].Name = L"UpperFilters"; - QueryTable[0].EntryContext = NULL; - QueryTable[0].Flags = 0; - QueryTable[0].DefaultType = REG_NONE; - - if (ClassKey == NULL) - { - return STATUS_SUCCESS; - } - - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, - (PWSTR)ClassKey, - QueryTable, - DeviceNode, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to load class %s filters: %08X\n", - Lower ? "lower" : "upper", Status); - return Status; - } - - return STATUS_SUCCESS; -} - NTSTATUS NTAPI MiResolveImageReferences(IN PVOID ImageBase, diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 17347573216..12f3e443c30 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -49,6 +49,8 @@ KSPIN_LOCK IopDeviceActionLock; KEVENT PiEnumerationFinished; static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; +#define TAG_PNP_DEVACTION 'aDpP' + /* TYPES *********************************************************************/ typedef struct _DEVICE_ACTION_REQUEST @@ -60,6 +62,29 @@ typedef struct _DEVICE_ACTION_REQUEST DEVICE_ACTION Action; } DEVICE_ACTION_REQUEST, *PDEVICE_ACTION_REQUEST; +typedef enum _ADD_DEV_DRIVER_TYPE +{ + LowerFilter, + LowerClassFilter, + DeviceDriver, + UpperFilter, + UpperClassFilter +} ADD_DEV_DRIVER_TYPE; + +typedef struct _ADD_DEV_DRIVERS_LIST +{ + LIST_ENTRY ListEntry; + PDRIVER_OBJECT DriverObject; + ADD_DEV_DRIVER_TYPE DriverType; +} ADD_DEV_DRIVERS_LIST, *PADD_DEV_DRIVERS_LIST; + +typedef struct _ATTACH_FILTER_DRIVERS_CONTEXT +{ + ADD_DEV_DRIVER_TYPE DriverType; + PDEVICE_NODE DeviceNode; + PLIST_ENTRY DriversListHead; +} ATTACH_FILTER_DRIVERS_CONTEXT, *PATTACH_FILTER_DRIVERS_CONTEXT; + /* FUNCTIONS *****************************************************************/ PDEVICE_OBJECT @@ -325,6 +350,500 @@ IopCreateDeviceInstancePath( return STATUS_SUCCESS; } +/** + * @brief Loads and/or returns the driver associated with the registry entry if the driver + * is enabled. In case of an error, sets up a corresponding Problem to the DeviceNode + */ +static +NTSTATUS +NTAPI +PiAttachFilterDriversCallback( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Ctx, + PVOID EntryContext) +{ + PATTACH_FILTER_DRIVERS_CONTEXT context = Ctx; + PDRIVER_OBJECT DriverObject; + NTSTATUS Status; + BOOLEAN loadDrivers = (BOOLEAN)(ULONG_PTR)EntryContext; + + PAGED_CODE(); + + // No filter value present + if (ValueType != REG_SZ) + return STATUS_SUCCESS; + + if (ValueLength <= sizeof(WCHAR)) + return STATUS_OBJECT_NAME_NOT_FOUND; + + // open the service registry key + UNICODE_STRING serviceName = { .Length = 0 }, servicesKeyName; + RtlInitUnicodeString(&serviceName, ValueData); + RtlInitUnicodeString(&servicesKeyName, ServicesKeyName); + + HANDLE ccsServicesHandle, serviceHandle = NULL; + + Status = IopOpenRegistryKeyEx(&ccsServicesHandle, NULL, &servicesKeyName, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open a registry key for \"%wZ\" (status %x)\n", &serviceName, Status); + return Status; + } + + Status = IopOpenRegistryKeyEx(&serviceHandle, ccsServicesHandle, &serviceName, KEY_READ); + ZwClose(ccsServicesHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open a registry key for \"%wZ\" (status %x)\n", &serviceName, Status); + return Status; + } + + PADD_DEV_DRIVERS_LIST driverEntry = ExAllocatePoolWithTag(PagedPool, + sizeof(*driverEntry), + TAG_PNP_DEVACTION); + + if (!driverEntry) + { + DPRINT1("Failed to allocate driverEntry for \"%wZ\"\n", &serviceName); + ZwClose(serviceHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // check if the driver is disabled + PKEY_VALUE_FULL_INFORMATION kvInfo; + SERVICE_LOAD_TYPE startType = DisableLoad; + + Status = IopGetRegistryValue(serviceHandle, L"Start", &kvInfo); + if (NT_SUCCESS(Status) && kvInfo->Type == REG_DWORD) + { + RtlMoveMemory(&startType, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + sizeof(startType)); + ExFreePool(kvInfo); + } + + // TODO: take into account other start types (like SERVICE_DEMAND_START) + if (startType >= DisableLoad) + { + if (!(context->DeviceNode->Flags & DNF_HAS_PROBLEM)) + { + PiSetDevNodeProblem(context->DeviceNode, CM_PROB_DISABLED_SERVICE); + } + + DPRINT("Service \"%wZ\" is disabled (start type %u)\n", &serviceName, startType); + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; + } + + // check if the driver is already loaded + UNICODE_STRING driverName; + Status = IopGetDriverNames(serviceHandle, &driverName, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to obtain the driver name for \"%wZ\"\n", &serviceName); + goto Cleanup; + } + + // try to open it + Status = ObReferenceObjectByName(&driverName, + OBJ_OPENIF | OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, /* PassedAccessState */ + 0, /* DesiredAccess */ + IoDriverObjectType, + KernelMode, + NULL, /* ParseContext */ + (PVOID*)&DriverObject); + RtlFreeUnicodeString(&driverName); + + // the driver was not probably loaded, try to load + if (!NT_SUCCESS(Status)) + { + if (loadDrivers) + { + Status = IopLoadDriver(serviceHandle, &DriverObject); + } + else + { + DPRINT("Service \"%wZ\" will not be loaded now\n", &serviceName); + // return failure, the driver will be loaded later (in a subsequent call) + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; + } + } + + if (NT_SUCCESS(Status)) + { + driverEntry->DriverObject = DriverObject; + driverEntry->DriverType = context->DriverType; + InsertTailList(context->DriversListHead, &driverEntry->ListEntry); + ZwClose(serviceHandle); + return STATUS_SUCCESS; + } + else + { + if (!(context->DeviceNode->Flags & DNF_HAS_PROBLEM)) + { + switch (Status) + { + case STATUS_INSUFFICIENT_RESOURCES: + PiSetDevNodeProblem(context->DeviceNode, CM_PROB_OUT_OF_MEMORY); + break; + case STATUS_FAILED_DRIVER_ENTRY: + PiSetDevNodeProblem(context->DeviceNode, CM_PROB_FAILED_DRIVER_ENTRY); + break; + case STATUS_ILL_FORMED_SERVICE_ENTRY: + PiSetDevNodeProblem(context->DeviceNode, CM_PROB_DRIVER_SERVICE_KEY_INVALID); + break; + default: + PiSetDevNodeProblem(context->DeviceNode, CM_PROB_DRIVER_FAILED_LOAD); + break; + } + } + + DPRINT1("Failed to load driver \"%wZ\" for %wZ (status %x)\n", + &serviceName, &context->DeviceNode->InstancePath, Status); + } + +Cleanup: + ExFreePoolWithTag(driverEntry, TAG_PNP_DEVACTION); + if (serviceHandle) + { + ZwClose(serviceHandle); + } + return Status; +} + + +/** + * @brief Calls PiAttachFilterDriversCallback for filter drivers (if any) + */ +static +NTSTATUS +PiAttachFilterDrivers( + PLIST_ENTRY DriversListHead, + PDEVICE_NODE DeviceNode, + HANDLE EnumSubKey, + HANDLE ClassKey, + BOOLEAN Lower, + BOOLEAN LoadDrivers) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = { { NULL, 0, NULL, NULL, 0, NULL, 0 }, }; + ATTACH_FILTER_DRIVERS_CONTEXT routineContext; + NTSTATUS Status; + + PAGED_CODE(); + + routineContext.DriversListHead = DriversListHead; + routineContext.DeviceNode = DeviceNode; + + // First add device filters + routineContext.DriverType = Lower ? LowerFilter : UpperFilter; + QueryTable[0] = (RTL_QUERY_REGISTRY_TABLE){ + .QueryRoutine = PiAttachFilterDriversCallback, + .Name = Lower ? L"LowerFilters" : L"UpperFilters", + .DefaultType = REG_NONE, + .EntryContext = (PVOID)(ULONG_PTR)LoadDrivers + }; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)EnumSubKey, + QueryTable, + &routineContext, + NULL); + if (ClassKey == NULL) + { + return Status; + } + + // Then add device class filters + routineContext.DriverType = Lower ? LowerClassFilter : UpperClassFilter; + QueryTable[0] = (RTL_QUERY_REGISTRY_TABLE){ + .QueryRoutine = PiAttachFilterDriversCallback, + .Name = Lower ? L"LowerFilters" : L"UpperFilters", + .DefaultType = REG_NONE, + .EntryContext = (PVOID)(ULONG_PTR)LoadDrivers + }; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)ClassKey, + QueryTable, + &routineContext, + NULL); + return Status; +} + +/** + * @brief Loads all drivers for a device node (actual service and filters) + * and calls their AddDevice routine + * + * @param[in] DeviceNode The device node + * @param[in] LoadDrivers Whether to load drivers if they are not loaded yet + * (used when storage subsystem is not yet initialized) + */ +NTSTATUS +PiCallDriverAddDevice( + _In_ PDEVICE_NODE DeviceNode, + _In_ BOOLEAN LoadDrivers) +{ + NTSTATUS Status; + HANDLE EnumRootKey, SubKey; + HANDLE ClassKey = NULL; + UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); + static UNICODE_STRING ccsControlClass = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); + PKEY_VALUE_FULL_INFORMATION kvInfo = NULL; + + PAGED_CODE(); + + // open the enumeration root key + Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, &EnumRoot, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed for \"%wZ\" (status %x)\n", &EnumRoot, Status); + return Status; + } + + // open an instance subkey + Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, &DeviceNode->InstancePath, KEY_READ); + ZwClose(EnumRootKey); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open a devnode instance key for \"%wZ\" (status %x)\n", + &DeviceNode->InstancePath, Status); + return Status; + } + + // try to get the class GUID of an instance and its registry key + Status = IopGetRegistryValue(SubKey, REGSTR_VAL_CLASSGUID, &kvInfo); + if (NT_SUCCESS(Status) && kvInfo->Type == REG_SZ && kvInfo->DataLength > sizeof(WCHAR)) + { + UNICODE_STRING classGUID = { + .MaximumLength = kvInfo->DataLength, + .Length = kvInfo->DataLength - sizeof(UNICODE_NULL), + .Buffer = (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset) + }; + HANDLE ccsControlHandle; + + Status = IopOpenRegistryKeyEx(&ccsControlHandle, NULL, &ccsControlClass, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed for \"%wZ\" (status %x)\n", + &ccsControlClass, Status); + } + else + { + // open the CCS\Constol\Class\<ClassGUID> key + Status = IopOpenRegistryKeyEx(&ClassKey, ccsControlHandle, &classGUID, KEY_READ); + ZwClose(ccsControlHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open class key \"%wZ\" (status %x)\n", &classGUID, Status); + } + } + + if (ClassKey) + { + // Check the Properties key of a class too + // Windows fills some device properties from this key (which is protected) + // TODO: add the device properties from this key + + UNICODE_STRING properties = RTL_CONSTANT_STRING(REGSTR_KEY_DEVICE_PROPERTIES); + HANDLE propertiesHandle; + + Status = IopOpenRegistryKeyEx(&propertiesHandle, ClassKey, &properties, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT("Properties key failed to open for \"%wZ\" (status %x)\n", + &classGUID, Status); + } + else + { + ZwClose(propertiesHandle); + } + } + ExFreePool(kvInfo); + } + + // the driver loading order: + // 1. LowerFilters + // 2. LowerClassFilters + // 3. Device driver (only one service!) + // 4. UpperFilters + // 5. UpperClassFilters + + LIST_ENTRY drvListHead; + InitializeListHead(&drvListHead); + + // lower (class) filters + Status = PiAttachFilterDrivers(&drvListHead, DeviceNode, SubKey, ClassKey, TRUE, LoadDrivers); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + ATTACH_FILTER_DRIVERS_CONTEXT routineContext = { + .DriversListHead = &drvListHead, + .DriverType = DeviceDriver, + .DeviceNode = DeviceNode + }; + + RTL_QUERY_REGISTRY_TABLE queryTable[2] = {{ + .QueryRoutine = PiAttachFilterDriversCallback, + .Name = L"Service", + .Flags = RTL_QUERY_REGISTRY_REQUIRED, + .DefaultType = REG_SZ, // REG_MULTI_SZ is not allowed here + .DefaultData = L"", + .EntryContext = (PVOID)(ULONG_PTR)LoadDrivers + },}; + + // device driver + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)SubKey, + queryTable, + &routineContext, + NULL); + if (NT_SUCCESS(Status)) + { + // do nothing + } + // if a driver is not found, but a device allows raw access -> proceed + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND && + (DeviceNode->CapabilityFlags & 0x00000040)) // CM_DEVCAP_RAWDEVICEOK + { + // add a dummy entry to the drivers list (need for later processing) + PADD_DEV_DRIVERS_LIST driverEntry = ExAllocatePoolZero(PagedPool, + sizeof(*driverEntry), + TAG_PNP_DEVACTION); + driverEntry->DriverType = DeviceDriver; + InsertTailList(&drvListHead, &driverEntry->ListEntry); + DPRINT("No service for \"%wZ\" (RawDeviceOK)\n", &DeviceNode->InstancePath); + } + else + { + if (Status == STATUS_OBJECT_TYPE_MISMATCH && !(DeviceNode->Flags & DNF_HAS_PROBLEM)) + { + PiSetDevNodeProblem(DeviceNode, CM_PROB_REGISTRY); + } + DPRINT("No service for \"%wZ\" (loadDrv: %u)\n", &DeviceNode->InstancePath, LoadDrivers); + goto Cleanup; + } + + // upper (class) filters + Status = PiAttachFilterDrivers(&drvListHead, DeviceNode, SubKey, ClassKey, FALSE, LoadDrivers); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + // finally loop through the stack and call AddDevice for every driver + for (PLIST_ENTRY listEntry = drvListHead.Flink; + listEntry != &drvListHead; + listEntry = listEntry->Flink) + { + PADD_DEV_DRIVERS_LIST driverEntry; + driverEntry = CONTAINING_RECORD(listEntry, ADD_DEV_DRIVERS_LIST, ListEntry); + PDRIVER_OBJECT driverObject = driverEntry->DriverObject; + + // FIXME: ReactOS is not quite ready for this assert + // (legacy drivers should not have AddDevice routine) + // ASSERT(!(DriverObject->Flags & DRVO_LEGACY_DRIVER)); + + if (driverObject && driverObject->DriverExtension->AddDevice) + { + Status = driverObject->DriverExtension->AddDevice(driverEntry->DriverObject, + DeviceNode->PhysicalDeviceObject); + } + else if (driverObject == NULL) + { + // valid only for DeviceDriver + ASSERT(driverEntry->DriverType == DeviceDriver); + ASSERT(DeviceNode->CapabilityFlags & 0x00000040); // CM_DEVCAP_RAWDEVICEOK + Status = STATUS_SUCCESS; + } + else + { + // HACK: the driver doesn't have a AddDevice routine. We shouldn't be here, + // but ReactOS' PnP stack is not that correct yet + DeviceNode->Flags |= DNF_LEGACY_DRIVER; + Status = STATUS_UNSUCCESSFUL; + } + + // for filter drivers we don't care about the AddDevice result + if (driverEntry->DriverType == DeviceDriver) + { + if (NT_SUCCESS(Status)) + { + PDEVICE_OBJECT fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + + // HACK: Check if we have a ACPI device (needed for power management) + if (fdo->DeviceType == FILE_DEVICE_ACPI) + { + static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; + + // There can be only one system power device + if (!SystemPowerDeviceNodeCreated) + { + PopSystemPowerDeviceNode = DeviceNode; + ObReferenceObject(PopSystemPowerDeviceNode->PhysicalDeviceObject); + SystemPowerDeviceNodeCreated = TRUE; + } + } + + ObDereferenceObject(fdo); + + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + } + else + { + // lower filters (if already started) will be removed upon this request + PiSetDevNodeProblem(DeviceNode, CM_PROB_FAILED_ADD); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + IopRemoveDevice(DeviceNode); + break; + } + } + +#if DBG + PDEVICE_OBJECT attachedDO = IoGetAttachedDevice(DeviceNode->PhysicalDeviceObject); + if (attachedDO->Flags & DO_DEVICE_INITIALIZING) + { + DPRINT1("DO_DEVICE_INITIALIZING is not cleared on a device 0x%p!\n", attachedDO); + } +#endif + } + +Cleanup: + while (!IsListEmpty(&drvListHead)) + { + PLIST_ENTRY listEntry = RemoveHeadList(&drvListHead); + PADD_DEV_DRIVERS_LIST driverEntry; + driverEntry = CONTAINING_RECORD(listEntry, ADD_DEV_DRIVERS_LIST, ListEntry); + + // drivers which don't have any devices (in case of failure) will be cleaned up + if (driverEntry->DriverObject) + { + ObDereferenceObject(driverEntry->DriverObject); + } + ExFreePoolWithTag(driverEntry, TAG_PNP_DEVACTION); + } + + ZwClose(SubKey); + if (ClassKey != NULL) + { + ZwClose(ClassKey); + } + + if (DeviceNode->Flags & DNF_ADDED) + { + IopStartDevice(DeviceNode); + } + + return Status; +} + NTSTATUS NTAPI IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode, @@ -1008,8 +1527,6 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, PVOID Context) { PDEVICE_NODE ParentDeviceNode; - NTSTATUS Status; - BOOLEAN BootDrivers = !PnpSystemInit; DPRINT("IopActionInitChildServices(%p, %p)\n", DeviceNode, Context); @@ -1043,114 +1560,7 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) return STATUS_SUCCESS; - if (DeviceNode->ServiceName.Buffer == NULL) - { - /* We don't need to worry about loading the driver because we're - * being driven in raw mode so our parent must be loaded to get here */ - Status = IopInitializeDevice(DeviceNode, NULL); - if (NT_SUCCESS(Status)) - { - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - } - else - { - PLDR_DATA_TABLE_ENTRY ModuleObject; - PDRIVER_OBJECT DriverObject; - - /* Get existing DriverObject pointer (in case the driver has - already been loaded and initialized) */ - Status = IopGetDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - FALSE); - - if (!NT_SUCCESS(Status)) - { - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); - - /* Driver is not initialized, try to load it */ - Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); - - if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) - { - UNICODE_STRING RegistryPath; - - // obtain a handle for driver's RegistryPath - RegistryPath.Length = 0; - RegistryPath.MaximumLength = sizeof(ServicesKeyName) + DeviceNode->ServiceName.Length; - RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath.MaximumLength, TAG_IO); - if (RegistryPath.Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto OpenHandleFail; - } - RtlAppendUnicodeToString(&RegistryPath, ServicesKeyName); - RtlAppendUnicodeStringToString(&RegistryPath, &DeviceNode->ServiceName); - - HANDLE serviceHandle; - Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryPath, KEY_READ); - RtlFreeUnicodeString(&RegistryPath); - if (!NT_SUCCESS(Status)) - { - goto OpenHandleFail; - } - - /* Initialize the driver */ - NTSTATUS driverEntryStatus; - Status = IopInitializeDriverModule(ModuleObject, - serviceHandle, - &DriverObject, - &driverEntryStatus); - ZwClose(serviceHandle); - - if (!NT_SUCCESS(Status)) - DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; - } - else if (Status == STATUS_DRIVER_UNABLE_TO_LOAD) - { - DPRINT1("Service '%wZ' is disabled\n", &DeviceNode->ServiceName); - DeviceNode->Problem = CM_PROB_DISABLED_SERVICE; - } - else - { - DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", - &DeviceNode->ServiceName, Status); - if (!BootDrivers) - DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; - } -OpenHandleFail: - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - } - - /* Driver is loaded and initialized at this point */ - if (NT_SUCCESS(Status)) - { - /* Initialize the device, including all filters */ - Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); - - /* Remove the extra reference */ - ObDereferenceObject(DriverObject); - } - else - { - /* - * Don't disable when trying to load only boot drivers - */ - if (!BootDrivers) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - } - } - } - + PiCallDriverAddDevice(DeviceNode, PnPBootDriversLoaded); return STATUS_SUCCESS; } diff --git a/ntoskrnl/io/pnpmgr/devnode.c b/ntoskrnl/io/pnpmgr/devnode.c index 0442e1765c2..090419f18a9 100644 --- a/ntoskrnl/io/pnpmgr/devnode.c +++ b/ntoskrnl/io/pnpmgr/devnode.c @@ -100,6 +100,23 @@ PiInsertDevNode( DeviceNode->Level = ParentNode->Level + 1; } +VOID +PiSetDevNodeProblem( + _In_ PDEVICE_NODE DeviceNode, + _In_ UINT32 Problem) +{ + DeviceNode->Flags |= DNF_HAS_PROBLEM; + DeviceNode->Problem = Problem; +} + +VOID +PiClearDevNodeProblem( + _In_ PDEVICE_NODE DeviceNode) +{ + DeviceNode->Flags &= ~DNF_HAS_PROBLEM; + DeviceNode->Problem = 0; +} + /** * @brief Creates a device node * diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index dd33a4b0258..e32c11e930d 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -286,145 +286,6 @@ Quickie: return i; } -NTSTATUS -NTAPI -PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode, - IN BOOLEAN LoadDriver, - IN PDRIVER_OBJECT DriverObject) -{ - NTSTATUS Status; - HANDLE EnumRootKey, SubKey; - HANDLE ControlKey, ClassKey = NULL, PropertiesKey; - UNICODE_STRING ClassGuid, Properties; - UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); - UNICODE_STRING ControlClass = - RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); - PKEY_VALUE_FULL_INFORMATION KeyValueInformation = NULL; - PWCHAR Buffer; - - /* Open enumeration root key */ - Status = IopOpenRegistryKeyEx(&EnumRootKey, - NULL, - &EnumRoot, - KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &EnumRoot, Status); - return Status; - } - - /* Open instance subkey */ - Status = IopOpenRegistryKeyEx(&SubKey, - EnumRootKey, - &DeviceNode->InstancePath, - KEY_READ); - ZwClose(EnumRootKey); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &DeviceNode->InstancePath, Status); - return Status; - } - - /* Get class GUID */ - Status = IopGetRegistryValue(SubKey, - REGSTR_VAL_CLASSGUID, - &KeyValueInformation); - if (NT_SUCCESS(Status)) - { - /* Convert to unicode string */ - Buffer = (PVOID)((ULONG_PTR)KeyValueInformation + KeyValueInformation->DataOffset); - PnpRegSzToString(Buffer, KeyValueInformation->DataLength, &ClassGuid.Length); - ClassGuid.MaximumLength = (USHORT)KeyValueInformation->DataLength; - ClassGuid.Buffer = Buffer; - - /* Open the key */ - Status = IopOpenRegistryKeyEx(&ControlKey, - NULL, - &ControlClass, - KEY_READ); - if (!NT_SUCCESS(Status)) - { - /* No class key */ - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &ControlClass, Status); - } - else - { - /* Open the class key */ - Status = IopOpenRegistryKeyEx(&ClassKey, - ControlKey, - &ClassGuid, - KEY_READ); - ZwClose(ControlKey); - if (!NT_SUCCESS(Status)) - { - /* No class key */ - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &ClassGuid, Status); - } - } - - /* Check if we made it till here */ - if (ClassKey) - { - /* Get the device properties */ - RtlInitUnicodeString(&Properties, REGSTR_KEY_DEVICE_PROPERTIES); - Status = IopOpenRegistryKeyEx(&PropertiesKey, - ClassKey, - &Properties, - KEY_READ); - if (!NT_SUCCESS(Status)) - { - /* No properties */ - DPRINT("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &Properties, Status); - PropertiesKey = NULL; - } - else - { - ZwClose(PropertiesKey); - } - } - - /* Free the registry data */ - ExFreePool(KeyValueInformation); - } - - /* Do ReactOS-style setup */ - Status = IopAttachFilterDrivers(DeviceNode, SubKey, ClassKey, TRUE); - if (!NT_SUCCESS(Status)) - { - IopRemoveDevice(DeviceNode); - goto Exit; - } - - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - { - goto Exit; - } - - Status = IopAttachFilterDrivers(DeviceNode, SubKey, ClassKey, FALSE); - if (!NT_SUCCESS(Status)) - { - IopRemoveDevice(DeviceNode); - goto Exit; - } - - Status = IopStartDevice(DeviceNode); - -Exit: - /* Close keys and return status */ - ZwClose(SubKey); - if (ClassKey != NULL) - { - ZwClose(ClassKey); - } - return Status; -} - CODE_SEG("INIT") NTSTATUS NTAPI diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 1a72481691b..37290335cfd 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -390,75 +390,6 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode) ZwClose(CriticalDeviceKey); } -NTSTATUS -FASTCALL -IopInitializeDevice(PDEVICE_NODE DeviceNode, - PDRIVER_OBJECT DriverObject) -{ - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - - if (!DriverObject) - { - /* Special case for bus driven devices */ - DeviceNode->Flags |= DNF_ADDED; - return STATUS_SUCCESS; - } - - if (!DriverObject->DriverExtension->AddDevice) - { - DeviceNode->Flags |= DNF_LEGACY_DRIVER; - } - - if (DeviceNode->Flags & DNF_LEGACY_DRIVER) - { - DeviceNode->Flags |= (DNF_ADDED | DNF_STARTED); - return STATUS_SUCCESS; - } - - /* This is a Plug and Play driver */ - DPRINT("Plug and Play driver found\n"); - ASSERT(DeviceNode->PhysicalDeviceObject); - - DPRINT("Calling %wZ->AddDevice(%wZ)\n", - &DriverObject->DriverName, - &DeviceNode->InstancePath); - Status = DriverObject->DriverExtension->AddDevice(DriverObject, - DeviceNode->PhysicalDeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("%wZ->AddDevice(%wZ) failed with status 0x%x\n", - &DriverObject->DriverName, - &DeviceNode->InstancePath, - Status); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - DeviceNode->Problem = CM_PROB_FAILED_ADD; - return Status; - } - - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - - /* Check if we have a ACPI device (needed for power management) */ - if (Fdo->DeviceType == FILE_DEVICE_ACPI) - { - static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; - - /* There can be only one system power device */ - if (!SystemPowerDeviceNodeCreated) - { - PopSystemPowerDeviceNode = DeviceNode; - ObReferenceObject(PopSystemPowerDeviceNode->PhysicalDeviceObject); - SystemPowerDeviceNodeCreated = TRUE; - } - } - - ObDereferenceObject(Fdo); - - IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); - - return STATUS_SUCCESS; -} - NTSTATUS IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject) {

1 0

[reactos] 07/10: [NTOS:IO] Refactoring of the driver initialization code (2)
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c95339da0addaa59a0d5… commit 4c95339da0addaa59a0d584c240a34f708079ce5 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Nov 25 03:18:31 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:33 2021 +0300 [NTOS:IO] Refactoring of the driver initialization code (2) - Do not hold the IopDriverLoadResource while trying to reference a driver object (but still acquire it when we actually need to load a driver) - Change IopLoadDriver and IopInitializeDriverModule to use registry handle instead of a service name string and/or full registry path - Do not try to reference a driver object inside IopLoadDriver. It's supposed to be done before the function call --- ntoskrnl/include/internal/io.h | 7 +- ntoskrnl/io/iomgr/driver.c | 387 ++++++++++++++++++++++++----------------- ntoskrnl/io/pnpmgr/devaction.c | 37 +++- 3 files changed, 267 insertions(+), 164 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 5da5950ba67..ad51265ba3f 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1127,14 +1127,13 @@ IopLoadServiceModule( NTSTATUS IopLoadDriver( - _In_opt_ PCUNICODE_STRING RegistryPath, - _Inout_ PDRIVER_OBJECT *DriverObject -); + _In_ HANDLE ServiceHandle, + _Out_ PDRIVER_OBJECT *DriverObject); NTSTATUS IopInitializeDriverModule( _In_ PLDR_DATA_TABLE_ENTRY ModuleObject, - _In_ PUNICODE_STRING ServiceName, + _In_ HANDLE ServiceHandle, _Out_ PDRIVER_OBJECT *DriverObject, _Out_ NTSTATUS *DriverEntryStatus); diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index a4b39b77f6d..994d7375af8 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -28,6 +28,7 @@ KSPIN_LOCK DriverBootReinitListLock; UNICODE_STRING IopHardwareDatabaseKey = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); +static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; POBJECT_TYPE IoDriverObjectType = NULL; @@ -47,7 +48,7 @@ PLIST_ENTRY IopGroupTable; typedef struct _LOAD_UNLOAD_PARAMS { NTSTATUS Status; - PCUNICODE_STRING RegistryPath; + PUNICODE_STRING RegistryPath; WORK_QUEUE_ITEM WorkItem; KEVENT Event; PDRIVER_OBJECT DriverObject; @@ -56,7 +57,7 @@ typedef struct _LOAD_UNLOAD_PARAMS NTSTATUS IopDoLoadUnloadDriver( - _In_opt_ PCUNICODE_STRING RegistryPath, + _In_opt_ PUNICODE_STRING RegistryPath, _Inout_ PDRIVER_OBJECT *DriverObject); /* PRIVATE FUNCTIONS **********************************************************/ @@ -135,7 +136,6 @@ IopGetDriverObject( DPRINT("IopGetDriverObject(%p '%wZ' %x)\n", DriverObject, ServiceName, FileSystem); - ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); *DriverObject = NULL; /* Create ModuleName string */ @@ -480,8 +480,8 @@ IopLoadServiceModule( * Module object representing the driver. It can be retrieved by IopLoadServiceModule. * Freed on failure, so in a such case this should not be accessed anymore * - * @param[in] ServiceName - * Name of the service (as in the registry) + * @param[in] ServiceHandle + * Handle to a driver's CCS/Services/<ServiceName> key * * @param[out] DriverObject * This contains the driver object if it was created (even with unsuccessfull result) @@ -495,56 +495,58 @@ IopLoadServiceModule( NTSTATUS IopInitializeDriverModule( _In_ PLDR_DATA_TABLE_ENTRY ModuleObject, - _In_ PUNICODE_STRING ServiceName, + _In_ HANDLE ServiceHandle, _Out_ PDRIVER_OBJECT *OutDriverObject, _Out_ NTSTATUS *DriverEntryStatus) { - static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; - UNICODE_STRING DriverName; - UNICODE_STRING RegistryKey; + UNICODE_STRING DriverName, RegistryPath, ServiceName; NTSTATUS Status; PAGED_CODE(); - ASSERT(ServiceName && ServiceName->Length != 0); - - // Make the registry path for the driver - RegistryKey.Length = 0; - RegistryKey.MaximumLength = sizeof(ServicesKeyName) + ServiceName->Length; - RegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, - RegistryKey.MaximumLength, - TAG_IO); - if (RegistryKey.Buffer == NULL) + // get the ServiceName + PKEY_BASIC_INFORMATION basicInfo; + ULONG infoLength; + Status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); + if (Status == STATUS_BUFFER_TOO_SMALL) { - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlAppendUnicodeToString(&RegistryKey, ServicesKeyName); - RtlAppendUnicodeStringToString(&RegistryKey, ServiceName); + basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); + if (!basicInfo) + { + MmUnloadSystemImage(ModuleObject); + return STATUS_INSUFFICIENT_RESOURCES; + } - // Open the registry key for this driver (it has to exist) - HANDLE serviceHandle; - PKEY_VALUE_FULL_INFORMATION kvInfo; + Status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(basicInfo, TAG_IO); + MmUnloadSystemImage(ModuleObject); + return Status; + } - Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryKey, KEY_READ); - if (!NT_SUCCESS(Status)) + ServiceName.Length = basicInfo->NameLength; + ServiceName.MaximumLength = basicInfo->NameLength; + ServiceName.Buffer = basicInfo->Name; + } + else { - RtlFreeUnicodeString(&RegistryKey); MmUnloadSystemImage(ModuleObject); - return Status; + return NT_SUCCESS(Status) ? STATUS_UNSUCCESSFUL : Status; } // Make the DriverName field of a DRIVER_OBJECT + PKEY_VALUE_FULL_INFORMATION kvInfo; // 1. Check the "ObjectName" field in the driver's registry key (it has the priority) - Status = IopGetRegistryValue(serviceHandle, L"ObjectName", &kvInfo); + Status = IopGetRegistryValue(ServiceHandle, L"ObjectName", &kvInfo); if (NT_SUCCESS(Status)) { // we're got the ObjectName. Use it to create the DRIVER_OBJECT if (kvInfo->Type != REG_SZ || kvInfo->DataLength == 0) { ExFreePool(kvInfo); - ZwClose(serviceHandle); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName MmUnloadSystemImage(ModuleObject); return STATUS_ILL_FORMED_SERVICE_ENTRY; } @@ -555,8 +557,7 @@ IopInitializeDriverModule( if (!DriverName.Buffer) { ExFreePool(kvInfo); - ZwClose(serviceHandle); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName MmUnloadSystemImage(ModuleObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -571,12 +572,11 @@ IopInitializeDriverModule( // 2. there is no "ObjectName" - construct it ourselves. Depending on a driver type, // it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" - Status = IopGetRegistryValue(serviceHandle, L"Type", &kvInfo); + Status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); if (!NT_SUCCESS(Status) || kvInfo->Type != REG_DWORD) { ExFreePool(kvInfo); - ZwClose(serviceHandle); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName MmUnloadSystemImage(ModuleObject); return STATUS_ILL_FORMED_SERVICE_ENTRY; } @@ -587,14 +587,13 @@ IopInitializeDriverModule( DriverName.Length = 0; if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) - DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName->Length; + DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName.Length; else - DriverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + ServiceName->Length; + DriverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + ServiceName.Length; DriverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DriverName.MaximumLength, TAG_IO); if (!DriverName.Buffer) { - ZwClose(serviceHandle); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName MmUnloadSystemImage(ModuleObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -604,13 +603,53 @@ IopInitializeDriverModule( else RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); - RtlAppendUnicodeStringToString(&DriverName, ServiceName); + RtlAppendUnicodeStringToString(&DriverName, &ServiceName); } - ZwClose(serviceHandle); - DPRINT("Driver name: '%wZ'\n", &DriverName); + // obtain the registry path for the DriverInit routine + PKEY_NAME_INFORMATION nameInfo; + Status = ZwQueryKey(ServiceHandle, KeyNameInformation, NULL, 0, &infoLength); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + nameInfo = ExAllocatePoolWithTag(NonPagedPool, infoLength, TAG_IO); + if (nameInfo) + { + Status = ZwQueryKey(ServiceHandle, + KeyNameInformation, + nameInfo, + infoLength, + &infoLength); + if (NT_SUCCESS(Status)) + { + RegistryPath.Length = nameInfo->NameLength; + RegistryPath.MaximumLength = nameInfo->NameLength; + RegistryPath.Buffer = nameInfo->Name; + } + else + { + ExFreePoolWithTag(nameInfo, TAG_IO); + } + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + Status = NT_SUCCESS(Status) ? STATUS_UNSUCCESSFUL : Status; + } + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName + RtlFreeUnicodeString(&DriverName); + MmUnloadSystemImage(ModuleObject); + return Status; + } + // create the driver object UINT32 ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); OBJECT_ATTRIBUTES objAttrs; @@ -632,7 +671,8 @@ IopInitializeDriverModule( (PVOID*)&driverObject); if (!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName RtlFreeUnicodeString(&DriverName); MmUnloadSystemImage(ModuleObject); DPRINT1("Error while creating driver object \"%wZ\" status %x\n", &DriverName, Status); @@ -665,9 +705,9 @@ IopInitializeDriverModule( Status = ObInsertObject(driverObject, NULL, FILE_READ_DATA, 0, NULL, &hDriver); if (!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName RtlFreeUnicodeString(&DriverName); - MmUnloadSystemImage(ModuleObject); // TODO: is it needed here? return Status; } @@ -684,7 +724,8 @@ IopInitializeDriverModule( if (!NT_SUCCESS(Status)) { - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName RtlFreeUnicodeString(&DriverName); return Status; } @@ -693,7 +734,7 @@ IopInitializeDriverModule( UNICODE_STRING serviceKeyName; serviceKeyName.Length = 0; // put a NULL character at the end for Windows compatibility - serviceKeyName.MaximumLength = ServiceName->MaximumLength + sizeof(UNICODE_NULL); + serviceKeyName.MaximumLength = ServiceName.MaximumLength + sizeof(UNICODE_NULL); serviceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, serviceKeyName.MaximumLength, TAG_IO); @@ -701,13 +742,15 @@ IopInitializeDriverModule( { ObMakeTemporaryObject(driverObject); ObDereferenceObject(driverObject); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName RtlFreeUnicodeString(&DriverName); return STATUS_INSUFFICIENT_RESOURCES; } /* Copy the name and set it in the driver extension */ - RtlCopyUnicodeString(&serviceKeyName, ServiceName); + RtlCopyUnicodeString(&serviceKeyName, &ServiceName); + ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName driverObject->DriverExtension->ServiceKeyName = serviceKeyName; /* Make a copy of the driver name to store in the driver object */ @@ -722,7 +765,7 @@ IopInitializeDriverModule( { ObMakeTemporaryObject(driverObject); ObDereferenceObject(driverObject); - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath RtlFreeUnicodeString(&DriverName); return STATUS_INSUFFICIENT_RESOURCES; } @@ -731,7 +774,7 @@ IopInitializeDriverModule( driverObject->DriverName = driverNamePaged; /* Finally, call its init function */ - Status = driverObject->DriverInit(driverObject, &RegistryKey); + Status = driverObject->DriverInit(driverObject, &RegistryPath); *DriverEntryStatus = Status; if (!NT_SUCCESS(Status)) { @@ -770,7 +813,7 @@ IopInitializeDriverModule( // TODO: for legacy drivers, unload the driver if it didn't create any DO - RtlFreeUnicodeString(&RegistryKey); + ExFreePoolWithTag(nameInfo, TAG_IO); // container for RegistryPath RtlFreeUnicodeString(&DriverName); if (!NT_SUCCESS(Status)) @@ -830,37 +873,62 @@ IopAttachFilterDriversCallback( ServiceName.MaximumLength = ServiceName.Length = (USHORT)wcslen(Filters) * sizeof(WCHAR); - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); + UNICODE_STRING RegistryPath; + + // Make the registry path for the driver + RegistryPath.Length = 0; + RegistryPath.MaximumLength = sizeof(ServicesKeyName) + ServiceName.Length; + RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath.MaximumLength, TAG_IO); + if (RegistryPath.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&RegistryPath, ServicesKeyName); + RtlAppendUnicodeStringToString(&RegistryPath, &ServiceName); + + HANDLE serviceHandle; + Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryPath, KEY_READ); + RtlFreeUnicodeString(&RegistryPath); + if (!NT_SUCCESS(Status)) + { + return Status; + } + Status = IopGetDriverObject(&DriverObject, &ServiceName, FALSE); if (!NT_SUCCESS(Status)) { + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); + /* Load and initialize the filter driver */ Status = IopLoadServiceModule(&ServiceName, &ModuleObject); if (!NT_SUCCESS(Status)) { ExReleaseResourceLite(&IopDriverLoadResource); KeLeaveCriticalRegion(); + ZwClose(serviceHandle); return Status; } NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(ModuleObject, - &ServiceName, + serviceHandle, &DriverObject, &driverEntryStatus); + + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); + if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); + ZwClose(serviceHandle); return Status; } } - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); + ZwClose(serviceHandle); Status = IopInitializeDevice(DeviceNode, DriverObject); @@ -1104,6 +1172,28 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) FileExtension[0] = UNICODE_NULL; } + UNICODE_STRING RegistryPath; + + // Make the registry path for the driver + RegistryPath.Length = 0; + RegistryPath.MaximumLength = sizeof(ServicesKeyName) + ServiceName.Length; + RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath.MaximumLength, TAG_IO); + if (RegistryPath.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&RegistryPath, ServicesKeyName); + RtlAppendUnicodeStringToString(&RegistryPath, &ServiceName); + RtlFreeUnicodeString(&ServiceName); + + HANDLE serviceHandle; + Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryPath, KEY_READ); + RtlFreeUnicodeString(&RegistryPath); + if (!NT_SUCCESS(Status)) + { + return Status; + } + /* Lookup the new Ldr entry in PsLoadedModuleList */ NextEntry = PsLoadedModuleList.Flink; while (NextEntry != &PsLoadedModuleList) @@ -1125,10 +1215,10 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) */ NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(LdrEntry, - &ServiceName, + serviceHandle, &DriverObject, &driverEntryStatus); - RtlFreeUnicodeString(&ServiceName); + ZwClose(serviceHandle); if (!NT_SUCCESS(Status)) { @@ -2050,69 +2140,47 @@ IoGetDriverObjectExtension(IN PDRIVER_OBJECT DriverObject, NTSTATUS IopLoadDriver( - _In_opt_ PCUNICODE_STRING RegistryPath, - _Inout_ PDRIVER_OBJECT *DriverObject) + _In_ HANDLE ServiceHandle, + _Out_ PDRIVER_OBJECT *DriverObject) { - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; - UNICODE_STRING ServiceName; NTSTATUS Status; - ULONG Type; PLDR_DATA_TABLE_ENTRY ModuleObject; PVOID BaseAddress; - WCHAR *cur; - - RtlInitUnicodeString(&ImagePath, NULL); - /* - * Get the service name from the registry key name. - */ - ASSERT(RegistryPath->Length >= sizeof(WCHAR)); - - ServiceName = *RegistryPath; - cur = RegistryPath->Buffer + RegistryPath->Length / sizeof(WCHAR) - 1; - while (RegistryPath->Buffer != cur) + PKEY_VALUE_FULL_INFORMATION kvInfo; + Status = IopGetRegistryValue(ServiceHandle, L"ImagePath", &kvInfo); + if (NT_SUCCESS(Status)) { - if (*cur == L'\\') + if (kvInfo->Type != REG_EXPAND_SZ || kvInfo->DataLength == 0) { - ServiceName.Buffer = cur + 1; - ServiceName.Length = RegistryPath->Length - - (USHORT)((ULONG_PTR)ServiceName.Buffer - - (ULONG_PTR)RegistryPath->Buffer); - break; + ExFreePool(kvInfo); + return STATUS_ILL_FORMED_SERVICE_ENTRY; } - cur--; - } - - /* - * Get service type. - */ - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - - RtlInitUnicodeString(&ImagePath, NULL); - - QueryTable[0].Name = L"Type"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Type; - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ImagePath; + ImagePath.Length = kvInfo->DataLength - sizeof(UNICODE_NULL), + ImagePath.MaximumLength = kvInfo->DataLength, + ImagePath.Buffer = ExAllocatePoolWithTag(PagedPool, ImagePath.MaximumLength, TAG_RTLREGISTRY); + if (!ImagePath.Buffer) + { + ExFreePool(kvInfo); + return STATUS_INSUFFICIENT_RESOURCES; + } - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - RegistryPath->Buffer, - QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) + RtlMoveMemory(ImagePath.Buffer, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + ImagePath.Length); + ExFreePool(kvInfo); + } + else { - DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - if (ImagePath.Buffer) ExFreePool(ImagePath.Buffer); return Status; } /* * Normalize the image path for all later processing. */ - Status = IopNormalizeImagePath(&ImagePath, &ServiceName); + Status = IopNormalizeImagePath(&ImagePath, NULL); if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); @@ -2120,67 +2188,65 @@ IopLoadDriver( } DPRINT("FullImagePath: '%wZ'\n", &ImagePath); - DPRINT("Type: %lx\n", Type); KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); + /* - * Get existing DriverObject pointer (in case the driver - * has already been loaded and initialized). + * Load the driver module */ - Status = IopGetDriverObject(DriverObject, - &ServiceName, - (Type == SERVICE_FILE_SYSTEM_DRIVER || - Type == SERVICE_RECOGNIZER_DRIVER)); + DPRINT("Loading module from %wZ\n", &ImagePath); + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); + RtlFreeUnicodeString(&ImagePath); if (!NT_SUCCESS(Status)) { - /* - * Load the driver module - */ - DPRINT("Loading module from %wZ\n", &ImagePath); - Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); - if (!NT_SUCCESS(Status)) - { - DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - return Status; - } - - /* - * Initialize the driver module if it's loaded for the first time - */ - IopDisplayLoadingMessage(&ServiceName); - - NTSTATUS driverEntryStatus; - Status = IopInitializeDriverModule(ModuleObject, - &ServiceName, - DriverObject, - &driverEntryStatus); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - return Status; - } - + DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); ExReleaseResourceLite(&IopDriverLoadResource); KeLeaveCriticalRegion(); + return Status; } - else + + // Display the loading message + ULONG infoLength; + Status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); + if (Status == STATUS_BUFFER_TOO_SMALL) { - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); + PKEY_BASIC_INFORMATION servName = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); + if (servName) + { + Status = ZwQueryKey(ServiceHandle, + KeyBasicInformation, + servName, + infoLength, + &infoLength); + if (NT_SUCCESS(Status)) + { + UNICODE_STRING serviceName = { + .Length = servName->NameLength, + .MaximumLength = servName->NameLength, + .Buffer = servName->Name + }; - DPRINT("DriverObject already exist in ObjectManager\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; + IopDisplayLoadingMessage(&serviceName); + } + ExFreePoolWithTag(servName, TAG_IO); + } + } - /* IopGetDriverObject references the DriverObject, so dereference it */ - ObDereferenceObject(*DriverObject); + NTSTATUS driverEntryStatus; + Status = IopInitializeDriverModule(ModuleObject, + ServiceHandle, + DriverObject, + &driverEntryStatus); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); } + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); + return Status; } @@ -2203,7 +2269,18 @@ IopLoadUnloadDriverWorker( else { // load request - LoadParams->Status = IopLoadDriver(LoadParams->RegistryPath, &LoadParams->DriverObject); + HANDLE serviceHandle; + NTSTATUS status; + status = IopOpenRegistryKeyEx(&serviceHandle, NULL, LoadParams->RegistryPath, KEY_READ); + if (!NT_SUCCESS(status)) + { + LoadParams->Status = status; + } + else + { + LoadParams->Status = IopLoadDriver(serviceHandle, &LoadParams->DriverObject); + ZwClose(serviceHandle); + } } if (LoadParams->SetEvent) @@ -2223,7 +2300,7 @@ IopLoadUnloadDriverWorker( */ NTSTATUS IopDoLoadUnloadDriver( - _In_opt_ PCUNICODE_STRING RegistryPath, + _In_opt_ PUNICODE_STRING RegistryPath, _Inout_ PDRIVER_OBJECT *DriverObject) { LOAD_UNLOAD_PARAMS LoadParams; diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index aebbf1a01c2..17347573216 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -47,6 +47,7 @@ WORK_QUEUE_ITEM IopDeviceActionWorkItem; BOOLEAN IopDeviceActionInProgress; KSPIN_LOCK IopDeviceActionLock; KEVENT PiEnumerationFinished; +static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; /* TYPES *********************************************************************/ @@ -1062,8 +1063,6 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); /* Get existing DriverObject pointer (in case the driver has already been loaded and initialized) */ Status = IopGetDriverObject( @@ -1073,17 +1072,44 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, if (!NT_SUCCESS(Status)) { + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); + /* Driver is not initialized, try to load it */ Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { + UNICODE_STRING RegistryPath; + + // obtain a handle for driver's RegistryPath + RegistryPath.Length = 0; + RegistryPath.MaximumLength = sizeof(ServicesKeyName) + DeviceNode->ServiceName.Length; + RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath.MaximumLength, TAG_IO); + if (RegistryPath.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto OpenHandleFail; + } + RtlAppendUnicodeToString(&RegistryPath, ServicesKeyName); + RtlAppendUnicodeStringToString(&RegistryPath, &DeviceNode->ServiceName); + + HANDLE serviceHandle; + Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryPath, KEY_READ); + RtlFreeUnicodeString(&RegistryPath); + if (!NT_SUCCESS(Status)) + { + goto OpenHandleFail; + } + /* Initialize the driver */ NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(ModuleObject, - &DeviceNode->ServiceName, + serviceHandle, &DriverObject, &driverEntryStatus); + ZwClose(serviceHandle); + if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; } @@ -1099,9 +1125,10 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, if (!BootDrivers) DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; } +OpenHandleFail: + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); } - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); /* Driver is loaded and initialized at this point */ if (NT_SUCCESS(Status))

1 0

[reactos] 06/10: [NTOS:IO] Refactor IopLoadUnloadDriver
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6a3aa0f0dbbc9901a9d7… commit a6a3aa0f0dbbc9901a9d74da419800bf8c064620 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Nov 20 18:51:33 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:32 2021 +0300 [NTOS:IO] Refactor IopLoadUnloadDriver - Split IopLoadUnloadDriver into IopLoadDriver and calling DriverUnload - Schedule the worker for (un)loading driver in a separate routine (IopDoLoadUnloadDriver) this allows IopLoadDriver to be called separately (if we are sure that we're in the system process) --- ntoskrnl/include/internal/io.h | 15 +---- ntoskrnl/io/iomgr/driver.c | 144 +++++++++++++++++++++++++++-------------- 2 files changed, 96 insertions(+), 63 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 47d587d413c..5da5950ba67 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -391,18 +391,6 @@ typedef struct _OPEN_PACKET PDEVICE_OBJECT TopDeviceObjectHint; } OPEN_PACKET, *POPEN_PACKET; -// -// Parameters packet for Load/Unload work item's context -// -typedef struct _LOAD_UNLOAD_PARAMS -{ - NTSTATUS Status; - PCUNICODE_STRING RegistryPath; - WORK_QUEUE_ITEM WorkItem; - KEVENT Event; - PDRIVER_OBJECT DriverObject; -} LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; - // // Boot Driver List Entry // @@ -1138,8 +1126,7 @@ IopLoadServiceModule( ); NTSTATUS -NTAPI -IopLoadUnloadDriver( +IopLoadDriver( _In_opt_ PCUNICODE_STRING RegistryPath, _Inout_ PDRIVER_OBJECT *DriverObject ); diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 0451064f6bc..a4b39b77f6d 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -41,6 +41,24 @@ extern KEVENT PiEnumerationFinished; USHORT IopGroupIndex; PLIST_ENTRY IopGroupTable; +/* TYPES *********************************************************************/ + +// Parameters packet for Load/Unload work item's context +typedef struct _LOAD_UNLOAD_PARAMS +{ + NTSTATUS Status; + PCUNICODE_STRING RegistryPath; + WORK_QUEUE_ITEM WorkItem; + KEVENT Event; + PDRIVER_OBJECT DriverObject; + BOOLEAN SetEvent; +} LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; + +NTSTATUS +IopDoLoadUnloadDriver( + _In_opt_ PCUNICODE_STRING RegistryPath, + _Inout_ PDRIVER_OBJECT *DriverObject); + /* PRIVATE FUNCTIONS **********************************************************/ NTSTATUS @@ -1395,7 +1413,9 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) PreviousMode, DriverServiceName); if (!NT_SUCCESS(Status)) + { return Status; + } DPRINT("IopUnloadDriver('%wZ', %u)\n", &CapturedServiceName, UnloadPnpDrivers); @@ -1562,7 +1582,7 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers) /* Set the unload invoked flag and call the unload routine */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; - Status = IopLoadUnloadDriver(NULL, &DriverObject); + Status = IopDoLoadUnloadDriver(NULL, &DriverObject); ASSERT(Status == STATUS_SUCCESS); /* Mark the driver object temporary, so it could be deleted later */ @@ -2028,22 +2048,8 @@ IoGetDriverObjectExtension(IN PDRIVER_OBJECT DriverObject, return DriverExtensions + 1; } -VOID -NTAPI -IopLoadUnloadDriverWorker( - _Inout_ PVOID Parameter) -{ - PLOAD_UNLOAD_PARAMS LoadParams = Parameter; - - ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); - LoadParams->Status = IopLoadUnloadDriver(LoadParams->RegistryPath, - &LoadParams->DriverObject); - KeSetEvent(&LoadParams->Event, 0, FALSE); -} - NTSTATUS -NTAPI -IopLoadUnloadDriver( +IopLoadDriver( _In_opt_ PCUNICODE_STRING RegistryPath, _Inout_ PDRIVER_OBJECT *DriverObject) { @@ -2056,38 +2062,6 @@ IopLoadUnloadDriver( PVOID BaseAddress; WCHAR *cur; - /* Load/Unload must be called from system process */ - if (PsGetCurrentProcess() != PsInitialSystemProcess) - { - LOAD_UNLOAD_PARAMS LoadParams; - - /* Prepare parameters block */ - LoadParams.RegistryPath = RegistryPath; - LoadParams.DriverObject = *DriverObject; - KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); - - /* Initialize and queue a work item */ - ExInitializeWorkItem(&LoadParams.WorkItem, - IopLoadUnloadDriverWorker, - &LoadParams); - ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); - - /* And wait till it completes */ - KeWaitForSingleObject(&LoadParams.Event, - UserRequest, - KernelMode, - FALSE, - NULL); - return LoadParams.Status; - } - - /* Check if it's an unload request */ - if (*DriverObject) - { - (*DriverObject)->DriverUnload(*DriverObject); - return STATUS_SUCCESS; - } - RtlInitUnicodeString(&ImagePath, NULL); /* @@ -2210,6 +2184,76 @@ IopLoadUnloadDriver( return Status; } +static +VOID +NTAPI +IopLoadUnloadDriverWorker( + _Inout_ PVOID Parameter) +{ + PLOAD_UNLOAD_PARAMS LoadParams = Parameter; + + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + + if (LoadParams->DriverObject) + { + // unload request + LoadParams->DriverObject->DriverUnload(LoadParams->DriverObject); + LoadParams->Status = STATUS_SUCCESS; + } + else + { + // load request + LoadParams->Status = IopLoadDriver(LoadParams->RegistryPath, &LoadParams->DriverObject); + } + + if (LoadParams->SetEvent) + { + KeSetEvent(&LoadParams->Event, 0, FALSE); + } +} + +/** + * @brief Process load and unload driver operations. This is mostly for NtLoadDriver + * and NtUnloadDriver, because their code should run inside PsInitialSystemProcess + * + * @param[in] RegistryPath The registry path + * @param DriverObject The driver object + * + * @return Status of the operation + */ +NTSTATUS +IopDoLoadUnloadDriver( + _In_opt_ PCUNICODE_STRING RegistryPath, + _Inout_ PDRIVER_OBJECT *DriverObject) +{ + LOAD_UNLOAD_PARAMS LoadParams; + + /* Prepare parameters block */ + LoadParams.RegistryPath = RegistryPath; + LoadParams.DriverObject = *DriverObject; + + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + LoadParams.SetEvent = TRUE; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + /* Initialize and queue a work item */ + ExInitializeWorkItem(&LoadParams.WorkItem, IopLoadUnloadDriverWorker, &LoadParams); + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait till it completes */ + KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, FALSE, NULL); + } + else + { + /* If we're already in a system process, call it right here */ + LoadParams.SetEvent = FALSE; + IopLoadUnloadDriverWorker(&LoadParams); + } + + return LoadParams.Status; +} + /* * NtLoadDriver * @@ -2249,7 +2293,9 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) PreviousMode, DriverServiceName); if (!NT_SUCCESS(Status)) + { return Status; + } DPRINT("NtLoadDriver('%wZ')\n", &CapturedServiceName); @@ -2262,7 +2308,7 @@ NtLoadDriver(IN PUNICODE_STRING DriverServiceName) /* Load driver and call its entry point */ DriverObject = NULL; - Status = IopLoadUnloadDriver(&CapturedServiceName, &DriverObject); + Status = IopDoLoadUnloadDriver(&CapturedServiceName, &DriverObject); ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); return Status;

1 0

[reactos] 05/10: [NTOS:IO] Refactoring of the driver initialization code
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e18a32df3afc77e06cb8c… commit e18a32df3afc77e06cb8cb71010017b3780d3d34 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Nov 20 17:18:43 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:32 2021 +0300 [NTOS:IO] Refactoring of the driver initialization code - Remove IopCreateDriver and put its code into IoCreateDriver and IopInitializeDriverModule. It's hard to extract a meaningful common part from it - Refactor IopInitializeDriverModule. Extend and put the DriverName generation logic into it. Now this function frees the ModuleObject in case of failure and returns STATUS_FAILED_DRIVER_ENTRY in case of DriverInit failure (will be used later) --- ntoskrnl/include/internal/io.h | 19 +- ntoskrnl/include/internal/mm.h | 4 + ntoskrnl/io/iomgr/driver.c | 431 ++++++++++++++++++++++++++++------------- ntoskrnl/io/pnpmgr/devaction.c | 5 +- 4 files changed, 306 insertions(+), 153 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 4e81a6f1c83..47d587d413c 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1116,15 +1116,6 @@ IopInitializeSystemDrivers( VOID ); -NTSTATUS -NTAPI -IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, - IN PDRIVER_INITIALIZE InitializationFunction, - IN PUNICODE_STRING RegistryPath OPTIONAL, - IN PCUNICODE_STRING ServiceName, - IN PLDR_DATA_TABLE_ENTRY ModuleObject OPTIONAL, - OUT PDRIVER_OBJECT *pDriverObject); - VOID NTAPI IopDeleteDriver( @@ -1154,13 +1145,11 @@ IopLoadUnloadDriver( ); NTSTATUS -FASTCALL IopInitializeDriverModule( - IN PLDR_DATA_TABLE_ENTRY ModuleObject, - IN PUNICODE_STRING ServiceName, - IN BOOLEAN FileSystemDriver, - OUT PDRIVER_OBJECT *DriverObject -); + _In_ PLDR_DATA_TABLE_ENTRY ModuleObject, + _In_ PUNICODE_STRING ServiceName, + _Out_ PDRIVER_OBJECT *DriverObject, + _Out_ NTSTATUS *DriverEntryStatus); NTSTATUS FASTCALL diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 4ef728cd25b..e34f2fbb856 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1401,6 +1401,10 @@ MmCallDllInitialize( IN PLIST_ENTRY ListHead ); +VOID +NTAPI +MmFreeDriverInitialization( + IN PLDR_DATA_TABLE_ENTRY LdrEntry); /* procsup.c *****************************************************************/ diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index f3f4c5a79a8..0451064f6bc 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -455,113 +455,320 @@ IopLoadServiceModule( return Status; } -VOID -NTAPI -MmFreeDriverInitialization(IN PLDR_DATA_TABLE_ENTRY LdrEntry); - -/* - * IopInitializeDriverModule +/** + * @brief Initialize a loaded driver * - * Initialize a loaded driver. + * @param[in] ModuleObject + * Module object representing the driver. It can be retrieved by IopLoadServiceModule. + * Freed on failure, so in a such case this should not be accessed anymore * - * ModuleObject - * Module object representing the driver. It can be retrieve by - * IopLoadServiceModule. + * @param[in] ServiceName + * Name of the service (as in the registry) * - * ServiceName - * Name of the service (as in registry). + * @param[out] DriverObject + * This contains the driver object if it was created (even with unsuccessfull result) * - * FileSystemDriver - * Set to TRUE for file system drivers. + * @param[out] DriverEntryStatus + * This contains the status value returned by the driver's DriverEntry routine + * (will not be valid of the return value is not STATUS_SUCCESS or STATUS_FAILED_DRIVER_ENTRY) * - * DriverObject - * On successful return this contains the driver object representing - * the loaded driver. + * @return Status of the operation */ NTSTATUS -FASTCALL IopInitializeDriverModule( - IN PLDR_DATA_TABLE_ENTRY ModuleObject, - IN PUNICODE_STRING ServiceName, - IN BOOLEAN FileSystemDriver, - OUT PDRIVER_OBJECT *DriverObject) + _In_ PLDR_DATA_TABLE_ENTRY ModuleObject, + _In_ PUNICODE_STRING ServiceName, + _Out_ PDRIVER_OBJECT *OutDriverObject, + _Out_ NTSTATUS *DriverEntryStatus) { static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING DriverName; UNICODE_STRING RegistryKey; - PDRIVER_INITIALIZE DriverEntry; - PDRIVER_OBJECT Driver; NTSTATUS Status; - DriverEntry = ModuleObject->EntryPoint; + PAGED_CODE(); - if (ServiceName != NULL && ServiceName->Length != 0) + ASSERT(ServiceName && ServiceName->Length != 0); + + // Make the registry path for the driver + RegistryKey.Length = 0; + RegistryKey.MaximumLength = sizeof(ServicesKeyName) + ServiceName->Length; + RegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, + RegistryKey.MaximumLength, + TAG_IO); + if (RegistryKey.Buffer == NULL) { - RegistryKey.Length = 0; - RegistryKey.MaximumLength = sizeof(ServicesKeyName) + ServiceName->Length; - RegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, - RegistryKey.MaximumLength, - TAG_IO); - if (RegistryKey.Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&RegistryKey, ServicesKeyName); + RtlAppendUnicodeStringToString(&RegistryKey, ServiceName); + + // Open the registry key for this driver (it has to exist) + HANDLE serviceHandle; + PKEY_VALUE_FULL_INFORMATION kvInfo; + + Status = IopOpenRegistryKeyEx(&serviceHandle, NULL, &RegistryKey, KEY_READ); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&RegistryKey); + MmUnloadSystemImage(ModuleObject); + return Status; + } + + // Make the DriverName field of a DRIVER_OBJECT + + // 1. Check the "ObjectName" field in the driver's registry key (it has the priority) + Status = IopGetRegistryValue(serviceHandle, L"ObjectName", &kvInfo); + if (NT_SUCCESS(Status)) + { + // we're got the ObjectName. Use it to create the DRIVER_OBJECT + if (kvInfo->Type != REG_SZ || kvInfo->DataLength == 0) + { + ExFreePool(kvInfo); + ZwClose(serviceHandle); + RtlFreeUnicodeString(&RegistryKey); + MmUnloadSystemImage(ModuleObject); + return STATUS_ILL_FORMED_SERVICE_ENTRY; + } + + DriverName.Length = kvInfo->DataLength - sizeof(WCHAR), + DriverName.MaximumLength = kvInfo->DataLength, + DriverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DriverName.MaximumLength, TAG_IO); + if (!DriverName.Buffer) { + ExFreePool(kvInfo); + ZwClose(serviceHandle); + RtlFreeUnicodeString(&RegistryKey); + MmUnloadSystemImage(ModuleObject); return STATUS_INSUFFICIENT_RESOURCES; } - RtlAppendUnicodeToString(&RegistryKey, ServicesKeyName); - RtlAppendUnicodeStringToString(&RegistryKey, ServiceName); + + RtlMoveMemory(DriverName.Buffer, + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + DriverName.Length); + ExFreePool(kvInfo); } else { - RtlInitEmptyUnicodeString(&RegistryKey, NULL, 0); - } + // 2. there is no "ObjectName" - construct it ourselves. Depending on a driver type, + // it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" + + Status = IopGetRegistryValue(serviceHandle, L"Type", &kvInfo); + if (!NT_SUCCESS(Status) || kvInfo->Type != REG_DWORD) + { + ExFreePool(kvInfo); + ZwClose(serviceHandle); + RtlFreeUnicodeString(&RegistryKey); + MmUnloadSystemImage(ModuleObject); + return STATUS_ILL_FORMED_SERVICE_ENTRY; + } + + UINT32 driverType; + RtlMoveMemory(&driverType, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), sizeof(UINT32)); + ExFreePool(kvInfo); - /* Create ModuleName string */ - if (ServiceName && ServiceName->Length > 0) - { DriverName.Length = 0; - DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName->Length; - DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, - DriverName.MaximumLength, - TAG_IO); - if (DriverName.Buffer == NULL) + if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) + DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName->Length; + else + DriverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + ServiceName->Length; + DriverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DriverName.MaximumLength, TAG_IO); + if (!DriverName.Buffer) { + ZwClose(serviceHandle); RtlFreeUnicodeString(&RegistryKey); + MmUnloadSystemImage(ModuleObject); return STATUS_INSUFFICIENT_RESOURCES; } - if (FileSystemDriver != FALSE) + if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) RtlAppendUnicodeToString(&DriverName, FILESYSTEM_ROOT_NAME); else RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); + RtlAppendUnicodeStringToString(&DriverName, ServiceName); + } + + ZwClose(serviceHandle); + + DPRINT("Driver name: '%wZ'\n", &DriverName); + + // create the driver object + UINT32 ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); + OBJECT_ATTRIBUTES objAttrs; + PDRIVER_OBJECT driverObject; + InitializeObjectAttributes(&objAttrs, + &DriverName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); - DPRINT("Driver name: '%wZ'\n", &DriverName); + Status = ObCreateObject(KernelMode, + IoDriverObjectType, + &objAttrs, + KernelMode, + NULL, + ObjectSize, + 0, + 0, + (PVOID*)&driverObject); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); + MmUnloadSystemImage(ModuleObject); + DPRINT1("Error while creating driver object \"%wZ\" status %x\n", &DriverName, Status); + return Status; } - else + + DPRINT("Created driver object 0x%p for \"%wZ\"\n", driverObject, &DriverName); + + RtlZeroMemory(driverObject, ObjectSize); + driverObject->Type = IO_TYPE_DRIVER; + driverObject->Size = sizeof(DRIVER_OBJECT); + driverObject->Flags = DRVO_LEGACY_DRIVER; // TODO: check the WDM_DRIVER flag on the module + driverObject->DriverSection = ModuleObject; + driverObject->DriverStart = ModuleObject->DllBase; + driverObject->DriverSize = ModuleObject->SizeOfImage; + driverObject->DriverInit = ModuleObject->EntryPoint; + driverObject->HardwareDatabase = &IopHardwareDatabaseKey; + driverObject->DriverExtension = (PDRIVER_EXTENSION)(driverObject + 1); + driverObject->DriverExtension->DriverObject = driverObject; + + /* Loop all Major Functions */ + for (INT i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + /* Invalidate each function */ + driverObject->MajorFunction[i] = IopInvalidDeviceRequest; + } + + /* Add the Object and get its handle */ + HANDLE hDriver; + Status = ObInsertObject(driverObject, NULL, FILE_READ_DATA, 0, NULL, &hDriver); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); + MmUnloadSystemImage(ModuleObject); // TODO: is it needed here? + return Status; + } + + /* Now reference it */ + Status = ObReferenceObjectByHandle(hDriver, + 0, + IoDriverObjectType, + KernelMode, + (PVOID*)&driverObject, + NULL); + + /* Close the extra handle */ + ZwClose(hDriver); + + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); + return Status; + } + + /* Set up the service key name buffer */ + UNICODE_STRING serviceKeyName; + serviceKeyName.Length = 0; + // put a NULL character at the end for Windows compatibility + serviceKeyName.MaximumLength = ServiceName->MaximumLength + sizeof(UNICODE_NULL); + serviceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + serviceKeyName.MaximumLength, + TAG_IO); + if (!serviceKeyName.Buffer) + { + ObMakeTemporaryObject(driverObject); + ObDereferenceObject(driverObject); + RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the name and set it in the driver extension */ + RtlCopyUnicodeString(&serviceKeyName, ServiceName); + driverObject->DriverExtension->ServiceKeyName = serviceKeyName; + + /* Make a copy of the driver name to store in the driver object */ + UNICODE_STRING driverNamePaged; + driverNamePaged.Length = 0; + // put a NULL character at the end for Windows compatibility + driverNamePaged.MaximumLength = DriverName.MaximumLength + sizeof(UNICODE_NULL); + driverNamePaged.Buffer = ExAllocatePoolWithTag(PagedPool, + driverNamePaged.MaximumLength, + TAG_IO); + if (!driverNamePaged.Buffer) { - RtlInitEmptyUnicodeString(&DriverName, NULL, 0); + ObMakeTemporaryObject(driverObject); + ObDereferenceObject(driverObject); + RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyUnicodeString(&driverNamePaged, &DriverName); + driverObject->DriverName = driverNamePaged; + + /* Finally, call its init function */ + Status = driverObject->DriverInit(driverObject, &RegistryKey); + *DriverEntryStatus = Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", &DriverName, Status); + // return a special status value in case of failure + Status = STATUS_FAILED_DRIVER_ENTRY; + } + + /* HACK: We're going to say if we don't have any DOs from DriverEntry, then we're not legacy. + * Other parts of the I/O manager depend on this behavior */ + if (!driverObject->DeviceObject) + { + driverObject->Flags &= ~DRVO_LEGACY_DRIVER; + } + + // Windows does this fixup - keep it for compatibility + for (INT i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + /* + * Make sure the driver didn't set any dispatch entry point to NULL! + * Doing so is illegal; drivers shouldn't touch entry points they + * do not implement. + */ + + /* Check if it did so anyway */ + if (!driverObject->MajorFunction[i]) + { + /* Print a warning in the debug log */ + DPRINT1("Driver <%wZ> set DriverObject->MajorFunction[%lu] to NULL!\n", + &driverObject->DriverName, i); + + /* Fix it up */ + driverObject->MajorFunction[i] = IopInvalidDeviceRequest; + } } - Status = IopCreateDriver(DriverName.Length > 0 ? &DriverName : NULL, - DriverEntry, - &RegistryKey, - ServiceName, - ModuleObject, - &Driver); + // TODO: for legacy drivers, unload the driver if it didn't create any DO + RtlFreeUnicodeString(&RegistryKey); RtlFreeUnicodeString(&DriverName); if (!NT_SUCCESS(Status)) { - DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); + // if the driver entry has been failed, clear the object + ObMakeTemporaryObject(driverObject); + ObDereferenceObject(driverObject); return Status; } - *DriverObject = Driver; + *OutDriverObject = driverObject; - MmFreeDriverInitialization((PLDR_DATA_TABLE_ENTRY)Driver->DriverSection); + MmFreeDriverInitialization((PLDR_DATA_TABLE_ENTRY)driverObject->DriverSection); /* Set the driver as initialized */ - IopReadyDeviceObjects(Driver); + IopReadyDeviceObjects(driverObject); if (PnpSystemInit) IopReinitializeDrivers(); @@ -621,10 +828,11 @@ IopAttachFilterDriversCallback( return Status; } + NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(ModuleObject, &ServiceName, - FALSE, - &DriverObject); + &DriverObject, + &driverEntryStatus); if (!NT_SUCCESS(Status)) { ExReleaseResourceLite(&IopDriverLoadResource); @@ -897,10 +1105,11 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) /* * Initialize the driver */ + NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(LdrEntry, &ServiceName, - FALSE, - &DriverObject); + &DriverObject, + &driverEntryStatus); RtlFreeUnicodeString(&ServiceName); if (!NT_SUCCESS(Status)) @@ -933,8 +1142,6 @@ IopInitializeBootDrivers(VOID) { PLIST_ENTRY ListHead, NextEntry, NextEntry2; PLDR_DATA_TABLE_ENTRY LdrEntry; - PDRIVER_OBJECT DriverObject; - LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; UNICODE_STRING DriverName; ULONG i, Index; @@ -943,17 +1150,10 @@ IopInitializeBootDrivers(VOID) PBOOT_DRIVER_LIST_ENTRY BootEntry; DPRINT("IopInitializeBootDrivers()\n"); - /* Setup the module object for the RAW FS Driver */ - ModuleObject.DllBase = NULL; - ModuleObject.SizeOfImage = 0; - ModuleObject.EntryPoint = RawFsDriverEntry; - RtlInitUnicodeString(&DriverName, L"RAW"); - - /* Initialize it */ - Status = IopInitializeDriverModule(&ModuleObject, - &DriverName, - TRUE, - &DriverObject); + /* Create the RAW FS built-in driver */ + RtlInitUnicodeString(&DriverName, L"\\FileSystem\\RAW"); + + Status = IoCreateDriver(&DriverName, RawFsDriverEntry); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -1461,14 +1661,16 @@ IopReinitializeBootDrivers(VOID) KeWaitForSingleObject(&PiEnumerationFinished, Executive, KernelMode, FALSE, NULL); } +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ NTSTATUS NTAPI -IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, - IN PDRIVER_INITIALIZE InitializationFunction, - IN PUNICODE_STRING RegistryPath OPTIONAL, - IN PCUNICODE_STRING ServiceName, - IN PLDR_DATA_TABLE_ENTRY ModuleObject OPTIONAL, - OUT PDRIVER_OBJECT *pDriverObject) +IoCreateDriver( + _In_opt_ PUNICODE_STRING DriverName, + _In_ PDRIVER_INITIALIZE InitializationFunction) { WCHAR NameBuffer[100]; USHORT NameLength; @@ -1525,20 +1727,10 @@ try_again: RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); - - /* - * Check whether RegistryPath and ModuleObject are both NULL because - * IoCreateDriver() was called to initialize a built-in driver. - */ - if ((RegistryPath != NULL) || (ModuleObject != NULL)) - DriverObject->Flags = DRVO_LEGACY_DRIVER; - else - DriverObject->Flags = DRVO_BUILTIN_DRIVER; - + DriverObject->Flags = DRVO_BUILTIN_DRIVER; DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; - DriverObject->DriverSection = ModuleObject; /* Loop all Major Functions */ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { @@ -1547,10 +1739,8 @@ try_again: } /* Set up the service key name buffer */ - ServiceKeyName.MaximumLength = ServiceName->Length + sizeof(UNICODE_NULL); - ServiceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, - ServiceKeyName.MaximumLength, - TAG_IO); + ServiceKeyName.MaximumLength = LocalDriverName.Length + sizeof(UNICODE_NULL); + ServiceKeyName.Buffer = ExAllocatePoolWithTag(PagedPool, LocalDriverName.MaximumLength, TAG_IO); if (!ServiceKeyName.Buffer) { /* Fail */ @@ -1559,9 +1749,9 @@ try_again: return STATUS_INSUFFICIENT_RESOURCES; } - /* Copy the name and set it in the driver extension */ - RtlCopyUnicodeString(&ServiceKeyName, - ServiceName); + /* For builtin drivers, the ServiceKeyName is equal to DriverName */ + RtlCopyUnicodeString(&ServiceKeyName, &LocalDriverName); + ServiceKeyName.Buffer[ServiceKeyName.Length / sizeof(WCHAR)] = UNICODE_NULL; DriverObject->DriverExtension->ServiceKeyName = ServiceKeyName; /* Make a copy of the driver name to store in the driver object */ @@ -1577,8 +1767,7 @@ try_again: return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyUnicodeString(&DriverObject->DriverName, - &LocalDriverName); + RtlCopyUnicodeString(&DriverObject->DriverName, &LocalDriverName); /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, @@ -1617,34 +1806,19 @@ try_again: return Status; } - DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; - DriverObject->DriverStart = ModuleObject ? ModuleObject->DllBase : 0; - DriverObject->DriverSize = ModuleObject ? ModuleObject->SizeOfImage : 0; - /* Finally, call its init function */ - DPRINT("RegistryKey: %wZ\n", RegistryPath); DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); - Status = (*InitializationFunction)(DriverObject, RegistryPath); + Status = (*InitializationFunction)(DriverObject, NULL); if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); - DriverObject->DriverSection = NULL; ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); return Status; } - else - { - /* Returns to caller the object */ - *pDriverObject = DriverObject; - } - /* We're going to say if we don't have any DOs from DriverEntry, then we're not legacy. - * Other parts of the I/O manager depend on this behavior */ - if (!DriverObject->DeviceObject) DriverObject->Flags &= ~DRVO_LEGACY_DRIVER; - - /* Loop all Major Functions */ + // Windows does this fixup - keep it for compatibility for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { /* @@ -1669,20 +1843,6 @@ try_again: return Status; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -IoCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, - IN PDRIVER_INITIALIZE InitializationFunction) -{ - PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, DriverName, NULL, &DriverObject); -} - /* * @implemented */ @@ -2019,17 +2179,16 @@ IopLoadUnloadDriver( */ IopDisplayLoadingMessage(&ServiceName); + NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(ModuleObject, &ServiceName, - (Type == SERVICE_FILE_SYSTEM_DRIVER || - Type == SERVICE_RECOGNIZER_DRIVER), - DriverObject); + DriverObject, + &driverEntryStatus); if (!NT_SUCCESS(Status)) { DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); ExReleaseResourceLite(&IopDriverLoadResource); KeLeaveCriticalRegion(); - MmUnloadSystemImage(ModuleObject); return Status; } diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 99e4e2b944d..aebbf1a01c2 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1079,10 +1079,11 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { /* Initialize the driver */ + NTSTATUS driverEntryStatus; Status = IopInitializeDriverModule(ModuleObject, &DeviceNode->ServiceName, - FALSE, - &DriverObject); + &DriverObject, + &driverEntryStatus); if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs