Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 07:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32][BASESRV] Fix interoperability with Win2k3 regarding NLS section security. (#4828)

Browse source 
Partially revert some aspects of commits 5696e4ba4 and bf40c7a31.
(See PR #4340.)

In order for Win2k3 kernel32.dll to operate with our basesrv.dll (or our
kernel32.dll to operate with Win2k3 basesrv.dll), we need in particular
to have the CreateNlsSecurityDescriptor() helper to exactly take the
expected parameters. Namely, a pointer to a **user-allocated**
SECURITY_DESCRIPTOR buffer, its size (and an access mask).

The function expects its caller to provide all this, and the caller expects
the function to initialize the security descriptor buffer. Note that the
function does *NOT* allocate a new descriptor buffer to be returned!

Indeed, with the way it currently is in master, using Win2k3 kernel32
with our basesrv is now failing with the errors:
```
NLSAPI: Could NOT Create ACL - c0000023.
(subsystems/win/basesrv/nls.c:279) NLS: CreateNlsSecurityDescriptor FAILED!: c0000023
NLSAPI: Could NOT initialize Server - c0000023.
(dll/ntdll/ldr/ldrinit.c:867) LDR: DLL_PROCESS_ATTACH for dll "kernel32.dll" (InitRoutine: 77E40D95) failed
```
(and, if we ever attempted to increase the so-claimed "dummy parameter"
descriptor size in the basesrv call, we would end up with its stack
corrupted and a crash).
Conversely, using our kernel32 with Win2k3 basesrv, would end up with
basesrv receiving a wrongly-initialized descriptor that would not work
(the buffer not being initialized with the contents of a descriptor, but
instead receiving some address to a descriptor allocated somewhere else).
This commit is contained in:
Hermès Bélusca-Maïto 2022-10-30 22:42:22 +01:00
parent 5bf0c00ddc
commit d8cc88ca80
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 175 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sdk/include/reactos/subsys/win/base.h
View file

@ -23,6 +23,14 @@ VOID
NTAPI
BaseSetProcessCreateNotify(IN BASE_PROCESS_CREATE_NOTIFY_ROUTINE ProcessCreateNotifyProc);
#define NLS_SIZEOF_ACE_AND_SIDS(n) \
(FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + \
FIELD_OFFSET(SID, SubAuthority) + (n)*RTL_FIELD_SIZE(SID, SubAuthority))
/* Minimal size for the security descriptors of the "\NLS\NlsSection*" sections */
#define NLS_SECTION_SECURITY_DESCRIPTOR_SIZE \
(sizeof(SECURITY_DESCRIPTOR) + sizeof(ACL) + NLS_SIZEOF_ACE_AND_SIDS(1))
typedef struct _NLS_USER_INFO
{
WCHAR sLanguage[80];