Commit 3c51b2c6 authored by Mikolaj Zalewski's avatar Mikolaj Zalewski Committed by Alexandre Julliard

advapi32/ntdll: MakeRelativeSD should preserve NULL pointers (with testcase).

parent cf84cbac
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include "wine/test.h" #include "wine/test.h"
#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); }
typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid );
typedef VOID (WINAPI *fnBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); typedef VOID (WINAPI *fnBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName );
typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee, typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee,
...@@ -49,6 +51,7 @@ typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, ...@@ -49,6 +51,7 @@ typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee,
GUID* pInheritedObjectGuid, GUID* pInheritedObjectGuid,
PSID pSid ); PSID pSid );
typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee ); typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee );
typedef BOOL (WINAPI *fnMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD );
typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str );
typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid );
static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD,
...@@ -81,6 +84,7 @@ fnBuildTrusteeWithNameA pBuildTrusteeWithNameA; ...@@ -81,6 +84,7 @@ fnBuildTrusteeWithNameA pBuildTrusteeWithNameA;
fnBuildTrusteeWithObjectsAndNameA pBuildTrusteeWithObjectsAndNameA; fnBuildTrusteeWithObjectsAndNameA pBuildTrusteeWithObjectsAndNameA;
fnBuildTrusteeWithObjectsAndSidA pBuildTrusteeWithObjectsAndSidA; fnBuildTrusteeWithObjectsAndSidA pBuildTrusteeWithObjectsAndSidA;
fnGetTrusteeNameA pGetTrusteeNameA; fnGetTrusteeNameA pGetTrusteeNameA;
fnMakeSelfRelativeSD pMakeSelfRelativeSD;
fnConvertSidToStringSidA pConvertSidToStringSidA; fnConvertSidToStringSidA pConvertSidToStringSidA;
fnConvertStringSidToSidA pConvertStringSidToSidA; fnConvertStringSidToSidA pConvertStringSidToSidA;
fnGetFileSecurityA pGetFileSecurityA; fnGetFileSecurityA pGetFileSecurityA;
...@@ -110,6 +114,7 @@ static void init(void) ...@@ -110,6 +114,7 @@ static void init(void)
(void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" );
pConvertSecurityDescriptorToStringSecurityDescriptorA = pConvertSecurityDescriptorToStringSecurityDescriptorA =
(void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" ); (void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" );
pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD");
pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA");
pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW");
...@@ -1443,6 +1448,46 @@ static void test_LookupAccountName(void) ...@@ -1443,6 +1448,46 @@ static void test_LookupAccountName(void)
HeapFree(GetProcessHeap(), 0, domain); HeapFree(GetProcessHeap(), 0, domain);
} }
static void test_security_descriptor(void)
{
SECURITY_DESCRIPTOR sd;
char buf[8192];
DWORD size;
BOOL isDefault, isPresent;
PACL pacl;
PSID psid;
InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n");
expect_eq(psid, NULL, PSID, "%p");
todo_wine expect_eq(isDefault, FALSE, BOOL, "%d");
sd.Control |= SE_DACL_PRESENT | SE_SACL_PRESENT;
SetLastError(0xdeadbeef);
size = 5;
expect_eq(MakeSelfRelativeSD(&sd, buf, &size), FALSE, BOOL, "%d");
expect_eq(GetLastError(), ERROR_INSUFFICIENT_BUFFER, DWORD, "%u");
ok(size > 5, "Size not increased\n");
if (size <= 8192)
{
expect_eq(MakeSelfRelativeSD(&sd, buf, &size), TRUE, BOOL, "%d");
ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n");
expect_eq(psid, NULL, PSID, "%p");
todo_wine expect_eq(isDefault, FALSE, BOOL, "%d");
ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n");
expect_eq(psid, NULL, PSID, "%p");
todo_wine expect_eq(isDefault, FALSE, BOOL, "%d");
ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n");
expect_eq(isPresent, TRUE, BOOL, "%d");
expect_eq(psid, NULL, PSID, "%p");
expect_eq(isDefault, FALSE, BOOL, "%d");
ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n");
expect_eq(isPresent, TRUE, BOOL, "%d");
expect_eq(psid, NULL, PSID, "%p");
expect_eq(isDefault, FALSE, BOOL, "%d");
}
}
#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__)
static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line)
{ {
...@@ -2017,6 +2062,7 @@ START_TEST(security) ...@@ -2017,6 +2062,7 @@ START_TEST(security)
test_token_attr(); test_token_attr();
test_LookupAccountSid(); test_LookupAccountSid();
test_LookupAccountName(); test_LookupAccountName();
test_security_descriptor();
test_process_security(); test_process_security();
test_impersonation_level(); test_impersonation_level();
test_SetEntriesInAcl(); test_SetEntriesInAcl();
......
...@@ -848,30 +848,44 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( ...@@ -848,30 +848,44 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD(
pRel->Control = pAbs->Control | SE_SELF_RELATIVE; pRel->Control = pAbs->Control | SE_SELF_RELATIVE;
offsetRel = sizeof(SECURITY_DESCRIPTOR); offsetRel = sizeof(SECURITY_DESCRIPTOR);
if (pAbs->Owner)
{
pRel->Owner = (PSID) offsetRel; pRel->Owner = (PSID) offsetRel;
length = RtlLengthSid(pAbs->Owner); length = RtlLengthSid(pAbs->Owner);
memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length); memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length);
offsetRel += length; offsetRel += length;
}
else
{
pRel->Owner = NULL;
}
if (pAbs->Group)
{
pRel->Group = (PSID) offsetRel; pRel->Group = (PSID) offsetRel;
length = RtlLengthSid(pAbs->Group); length = RtlLengthSid(pAbs->Group);
memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length); memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length);
offsetRel += length;
}
else
{
pRel->Group = NULL;
}
if (pRel->Control & SE_SACL_PRESENT) if (pAbs->Sacl)
{ {
offsetRel += length;
pRel->Sacl = (PACL) offsetRel; pRel->Sacl = (PACL) offsetRel;
length = pAbs->Sacl->AclSize; length = pAbs->Sacl->AclSize;
memcpy((LPBYTE)pRel + offsetRel, pAbs->Sacl, length); memcpy((LPBYTE)pRel + offsetRel, pAbs->Sacl, length);
offsetRel += length;
} }
else else
{ {
pRel->Sacl = NULL; pRel->Sacl = NULL;
} }
if (pRel->Control & SE_DACL_PRESENT) if (pAbs->Dacl)
{ {
offsetRel += length;
pRel->Dacl = (PACL) offsetRel; pRel->Dacl = (PACL) offsetRel;
length = pAbs->Dacl->AclSize; length = pAbs->Dacl->AclSize;
memcpy((LPBYTE)pRel + offsetRel, pAbs->Dacl, length); memcpy((LPBYTE)pRel + offsetRel, pAbs->Dacl, length);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment