- Fix parameter checks in NtAcceptConnectPort.

- Make CSRSS properly fill out the ServerView structure's length so that it can be validated by the kernel.

svn path=/trunk/; revision=24677

diff --git a/reactos/ntoskrnl/lpc/ntlpc/complete.c b/reactos/ntoskrnl/lpc/ntlpc/complete.c
index 27376b8..44b2f52 100644 (file)
--- a/reactos/ntoskrnl/lpc/ntlpc/complete.c
+++ b/reactos/ntoskrnl/lpc/ntlpc/complete.c
@@ -65,14 +65,14 @@ NtAcceptConnectPort(OUT PHANDLE PortHandle,
              ServerView);\r
 \r
     /* Validate the size of the server view */\r
-    if ((ServerView) && (ServerView->Length != sizeof(PORT_VIEW)))\r
+    if ((ServerView) && (ServerView->Length != sizeof(REMOTE_PORT_VIEW)))\r
     {\r
         /* Invalid size */\r
         return STATUS_INVALID_PARAMETER;\r
     }\r
 \r
     /* Validate the size of the client view */\r
-    if ((ClientView) && (ClientView->Length != sizeof(REMOTE_PORT_VIEW)))\r
+    if ((ClientView) && (ClientView->Length != sizeof(PORT_VIEW)))\r
     {\r
         /* Invalid size */\r
         return STATUS_INVALID_PARAMETER;\r

diff --git a/reactos/subsystems/win32/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c
index b218156..5ac6957 100644 (file)
--- a/reactos/subsystems/win32/csrss/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/api/wapi.c
@@ -222,6 +222,7 @@ ServerApiPortThread (PVOID PortHandle)
    for (;;)
      {
         REMOTE_PORT_VIEW LpcRead;
+        LpcRead.Length = sizeof(LpcRead);
         ServerPort = NULL;
 
        Status = NtListenPort (hApiListenPort, Request);