https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab5fdac922def35914942b...
commit ab5fdac922def35914942b1211b8b49b57243586 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Tue Nov 1 22:06:12 2022 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Thu Nov 3 02:55:49 2022 +0100
[NTOS] Add TAG_DACL in tag.h and use it. --- ntoskrnl/include/internal/tag.h | 1 + ntoskrnl/mm/ARM3/mminit.c | 4 ++-- ntoskrnl/mm/pagefile.c | 30 +++++++++++++++--------------- ntoskrnl/ob/obname.c | 6 +++--- 4 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index b79a8a2a2c0..f7a021152ce 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -165,6 +165,7 @@ #define TAG_SID_AND_ATTRIBUTES 'aSeS' #define TAG_SID_VALIDATE 'vSeS' #define TAG_ACCESS_CHECK_RIGHT 'rCeS' +#define TAG_DACL 'lcaD'
/* LPC Tags */ #define TAG_LPC_MESSAGE 'McpL' diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 400f8965dd5..bd5ab3caa88 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -1264,7 +1264,7 @@ MiCreateMemoryEvent(IN PUNICODE_STRING Name, RtlLengthSid(SeWorldSid);
/* Allocate space for the DACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, DaclLength, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, DaclLength, TAG_DACL); if (!Dacl) return STATUS_INSUFFICIENT_RESOURCES;
/* Setup the ACL inside it */ @@ -1314,7 +1314,7 @@ MiCreateMemoryEvent(IN PUNICODE_STRING Name, FALSE); CleanUp: /* Free the DACL */ - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL);
/* Check if this is the success path */ if (NT_SUCCESS(Status)) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 6f73c28d37d..5b35860862f 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -476,7 +476,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, /* Create the DACL: we will only allow two SIDs */ Count = sizeof(ACL) + (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)) + (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)); - Dacl = ExAllocatePoolWithTag(PagedPool, Count, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, Count, TAG_DACL); if (Dacl == NULL) { ExFreePoolWithTag(Buffer, TAG_MM); @@ -487,7 +487,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlCreateAcl(Dacl, Count, ACL_REVISION); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -496,7 +496,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeAliasAdminsSid); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -505,7 +505,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeLocalSystemSid); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -514,7 +514,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, TRUE, Dacl, FALSE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -573,7 +573,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -590,7 +590,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -625,7 +625,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_NOT_FOUND; } @@ -636,7 +636,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INVALID_PARAMETER_2; } @@ -646,7 +646,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INVALID_PARAMETER_3; } @@ -657,7 +657,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_NOT_IMPLEMENTED; } @@ -665,7 +665,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { DPRINT1("Failed creating page file: %lx\n", Status); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -676,17 +676,17 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = ZwSetSecurityObject(FileHandle, DACL_SECURITY_INFORMATION, &SecurityDescriptor); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); ZwClose(FileHandle); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } }
/* DACL is no longer needed, free it */ - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL);
- /* FIXME: To enable once page file managment is moved to ARM3 */ + /* FIXME: To enable once page file management is moved to ARM3 */ #if 0 /* Check we won't overflow commit limit with the page file */ if (MmTotalCommitLimitMaximum + (SafeMaximumSize.QuadPart >> PAGE_SHIFT) <= MmTotalCommitLimitMaximum) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 667815d41dc..5c829327c14 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -58,7 +58,7 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) sizeof(ACE) + RtlLengthSid(SeCreatorOwnerSid);
/* Allocate the ACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, TAG_DACL); if (Dacl == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -117,7 +117,7 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) sizeof(ACE) + RtlLengthSid(SeLocalSystemSid);
/* Allocate the ACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, TAG_DACL); if (Dacl == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -168,7 +168,7 @@ ObpFreeDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) ASSERT(NT_SUCCESS(Status)); ASSERT(DaclPresent); ASSERT(Dacl != NULL); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); }
CODE_SEG("INIT")
-
Hermès Bélusca-Maïto