ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Properly handle empty but present ACLs in self-relative descriptors.

Browse Source
This commit is contained in:
Alexandre Julliard 2010-02-18 12:57:33 +01:00
parent 9c87c88837
commit 8543c32442
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/ntdll/sec.c
View File

@ -478,12 +478,12 @@ NTSTATUS WINAPI RtlCopySecurityDescriptor(PSECURITY_DESCRIPTOR pSourceSD, PSECUR
length = RtlLengthSid( Group ); length = RtlLengthSid( Group );
RtlCopySid(length, SELF_RELATIVE_FIELD( dst, Group ), Group); RtlCopySid(length, SELF_RELATIVE_FIELD( dst, Group ), Group);
} }
if (src->Control & SE_SACL_PRESENT) if ((src->Control & SE_SACL_PRESENT) && src->Sacl)
{ {
Sacl = (PACL)SELF_RELATIVE_FIELD( src, Sacl ); Sacl = (PACL)SELF_RELATIVE_FIELD( src, Sacl );
copy_acl(Sacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Sacl ), Sacl); copy_acl(Sacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Sacl ), Sacl);
} }
if (src->Control & SE_DACL_PRESENT) if ((src->Control & SE_DACL_PRESENT) && src->Dacl)
{ {
Dacl = (PACL)SELF_RELATIVE_FIELD( src, Dacl ); Dacl = (PACL)SELF_RELATIVE_FIELD( src, Dacl );
copy_acl(Dacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Dacl ), Dacl); copy_acl(Dacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Dacl ), Dacl);
@ -604,7 +604,7 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(
if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) ) if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) )
{ {
if ( SE_SELF_RELATIVE & lpsd->Control) if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Dacl)
*pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl ); *pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl );
else else
*pDacl = lpsd->Dacl; *pDacl = lpsd->Dacl;
@ -673,7 +673,7 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(
if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) ) if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) )
{ {
if (SE_SELF_RELATIVE & lpsd->Control) if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Sacl)
*pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl ); *pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl );
else else
*pSacl = lpsd->Sacl; *pSacl = lpsd->Sacl;
@ -944,14 +944,14 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(
status = STATUS_BUFFER_TOO_SMALL; status = STATUS_BUFFER_TOO_SMALL;
} }
if (pRel->Control & SE_DACL_PRESENT && if ((pRel->Control & SE_DACL_PRESENT) && pRel->Dacl &&
*lpdwDaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize) *lpdwDaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize)
{ {
*lpdwDaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize; *lpdwDaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize;
status = STATUS_BUFFER_TOO_SMALL; status = STATUS_BUFFER_TOO_SMALL;
} }
if (pRel->Control & SE_SACL_PRESENT && if ((pRel->Control & SE_SACL_PRESENT) && pRel->Sacl &&
*lpdwSaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize) *lpdwSaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize)
{ {
*lpdwSaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize; *lpdwSaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize;
@ -983,7 +983,7 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(
pAbs->Owner = NULL; pAbs->Owner = NULL;
pAbs->Group = NULL; pAbs->Group = NULL;
if (pRel->Control & SE_SACL_PRESENT) if ((pRel->Control & SE_SACL_PRESENT) && pRel->Sacl)
{ {
PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Sacl ); PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Sacl );
@ -991,7 +991,7 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(
pAbs->Sacl = pSacl; pAbs->Sacl = pSacl;
} }
if (pRel->Control & SE_DACL_PRESENT) if ((pRel->Control & SE_DACL_PRESENT) && pRel->Dacl)
{ {
PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Dacl ); PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Dacl );
memcpy(pDacl, pAcl, pAcl->AclSize); memcpy(pDacl, pAcl, pAcl->AclSize);