Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 01/01: [NTOS:SE] Reorganize the security manager component

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a2c62b544d6539f6c671… commit 9a2c62b544d6539f6c6719190d841731d81816d2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat May 28 21:14:04 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 29 20:22:19 2022 +0200 [NTOS:SE] Reorganize the security manager component The current state of Security manager's code is kind of a mess. Mainly, there's code scattered around places where they shouldn't belong and token implementation (token.c) is already of a bloat in itself as it is. The file has over 6k lines and it's subject to grow exponentially with improvements, features, whatever that is. With that being said, the token implementation code in the kernel will be split accordingly and rest of the code moved to appropriate places. The new layout will look as follows (excluding the already existing files): - client.c (Client security implementation code) - objtype.c (Object type list implementation code -- more code related to object types will be put here when I'm going to implement object type access checks in the future) - subject.c (Subject security context support) The token implementation in the kernel will be split in 4 distinct files as shown: - token.c (Base token support routines) - tokenlif.c (Life management of a token object -- that is Duplication, Creation and Filtering) - tokencls.c (Token Query/Set Information Classes support) - tokenadj.c (Token privileges/groups adjusting support) In addition to that, tidy up the internal header and reorganize it as well. --- ntoskrnl/include/internal/se.h | 532 ++-- ntoskrnl/ntos.cmake | 6 + ntoskrnl/se/access.c | 711 ----- ntoskrnl/se/audit.c | 103 +- ntoskrnl/se/client.c | 331 +++ ntoskrnl/se/objtype.c | 115 + ntoskrnl/se/sid.c | 140 + ntoskrnl/se/subject.c | 185 ++ ntoskrnl/se/token.c | 5563 ++++------------------------------------ ntoskrnl/se/tokenadj.c | 910 +++++++ ntoskrnl/se/tokencls.c | 1588 ++++++++++++ ntoskrnl/se/tokenlif.c | 2201 ++++++++++++++++ 12 files changed, 6325 insertions(+), 6060 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 034203d9313..db2dd0b58a3 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -1,5 +1,16 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Internal header for the Security Manager + * COPYRIGHT: Copyright Eric Kohl + * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + #pragma once +// +// Internal ACE type structures +// typedef struct _KNOWN_ACE { ACE_HEADER Header; @@ -24,6 +35,9 @@ typedef struct _KNOWN_COMPOUND_ACE ULONG SidStart; } KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; +// +// Access Check Rights +// typedef struct _ACCESS_CHECK_RIGHTS { ACCESS_MASK RemainingAccessRights; @@ -37,6 +51,9 @@ typedef enum _ACCESS_CHECK_RIGHT_TYPE AccessCheckRegular } ACCESS_CHECK_RIGHT_TYPE; +// +// Token Audit Policy Information structure +// typedef struct _TOKEN_AUDIT_POLICY_INFORMATION { ULONG PolicyCount; @@ -47,10 +64,16 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION } Policies[1]; } TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION; +// +// Token creation method defines (for debugging purposes) +// #define TOKEN_CREATE_METHOD 0xCUL #define TOKEN_DUPLICATE_METHOD 0xDUL #define TOKEN_FILTER_METHOD 0xFUL +// +// Security descriptor internal helpers +// FORCEINLINE PSID SepGetGroupFromDescriptor( @@ -137,14 +160,18 @@ SepGetSaclFromDescriptor( #ifndef RTL_H -/* SID Authorities */ +// +// SID Authorities +// extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeWorldSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeLocalSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeCreatorSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeNtSidAuthority; -/* SIDs */ +// +// SIDs +// extern PSID SeNullSid; extern PSID SeWorldSid; extern PSID SeLocalSid; @@ -177,7 +204,9 @@ extern PSID SeAnonymousLogonSid; extern PSID SeLocalServiceSid; extern PSID SeNetworkServiceSid; -/* Privileges */ +// +// Privileges +// extern const LUID SeCreateTokenPrivilege; extern const LUID SeAssignPrimaryTokenPrivilege; extern const LUID SeLockMemoryPrivilege; @@ -213,14 +242,18 @@ extern const LUID SeIncreaseWorkingSetPrivilege; extern const LUID SeTimeZonePrivilege; extern const LUID SeCreateSymbolicLinkPrivilege; -/* DACLs */ +// +// DACLs +// extern PACL SePublicDefaultUnrestrictedDacl; extern PACL SePublicOpenDacl; extern PACL SePublicOpenUnrestrictedDacl; extern PACL SeUnrestrictedDacl; extern PACL SeSystemAnonymousLogonDacl; -/* SDs */ +// +// SDs +// extern PSECURITY_DESCRIPTOR SePublicDefaultSd; extern PSECURITY_DESCRIPTOR SePublicDefaultUnrestrictedSd; extern PSECURITY_DESCRIPTOR SePublicOpenSd; @@ -229,11 +262,16 @@ extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; extern PSECURITY_DESCRIPTOR SeSystemAnonymousLogonSd; -/* Anonymous Logon Tokens */ +// +// Anonymous Logon Tokens +// extern PTOKEN SeAnonymousLogonToken; extern PTOKEN SeAnonymousLogonTokenNoEveryone; +// +// Token lock management macros +// #define SepAcquireTokenLockExclusive(Token) \ { \ KeEnterCriticalRegion(); \ @@ -254,68 +292,116 @@ extern PTOKEN SeAnonymousLogonTokenNoEveryone; // // Token Functions // -BOOLEAN +CODE_SEG("INIT") +VOID NTAPI -SepTokenIsOwner( - _In_ PACCESS_TOKEN _Token, - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ BOOLEAN TokenLocked); +SepInitializeTokenImplementation(VOID); -BOOLEAN +CODE_SEG("INIT") +PTOKEN NTAPI -SepSidInToken( - _In_ PACCESS_TOKEN _Token, - _In_ PSID Sid); +SepCreateSystemProcessToken(VOID); -BOOLEAN +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID); + +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID); + +NTSTATUS NTAPI -SepSidInTokenEx( - _In_ PACCESS_TOKEN _Token, - _In_ PSID PrincipalSelfSid, - _In_ PSID _Sid, - _In_ BOOLEAN Deny, - _In_ BOOLEAN Restricted); +SepDuplicateToken( + _In_ PTOKEN Token, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN EffectiveOnly, + _In_ TOKEN_TYPE TokenType, + _In_ SECURITY_IMPERSONATION_LEVEL Level, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ PTOKEN* NewAccessToken); -BOOLEAN +NTSTATUS NTAPI -SeTokenCanImpersonate( - _In_ PTOKEN ProcessToken, - _In_ PTOKEN TokenToImpersonate, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); +SepCreateToken( + _Out_ PHANDLE TokenHandle, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TOKEN_TYPE TokenType, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, + _In_ PLUID AuthenticationId, + _In_ PLARGE_INTEGER ExpirationTime, + _In_ PSID_AND_ATTRIBUTES User, + _In_ ULONG GroupCount, + _In_ PSID_AND_ATTRIBUTES Groups, + _In_ ULONG GroupsLength, + _In_ ULONG PrivilegeCount, + _In_ PLUID_AND_ATTRIBUTES Privileges, + _In_opt_ PSID Owner, + _In_ PSID PrimaryGroup, + _In_opt_ PACL DefaultDacl, + _In_ PTOKEN_SOURCE TokenSource, + _In_ BOOLEAN SystemToken); -/* Functions */ -CODE_SEG("INIT") BOOLEAN NTAPI -SeInitSystem(VOID); +SepTokenIsOwner( + _In_ PACCESS_TOKEN _Token, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN TokenLocked); + +NTSTATUS +SepCreateTokenLock( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") VOID -NTAPI -SepInitPrivileges(VOID); +SepDeleteTokenLock( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitSecurityIDs(VOID); +VOID +SepUpdatePrivilegeFlagsToken( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitDACLs(VOID); +NTSTATUS +SepFindPrimaryGroupAndDefaultOwner( + _In_ PTOKEN Token, + _In_ PSID PrimaryGroup, + _In_opt_ PSID DefaultOwner, + _Out_opt_ PULONG PrimaryGroupIndex, + _Out_opt_ PULONG DefaultOwnerIndex); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitSDs(VOID); +VOID +SepUpdateSinglePrivilegeFlagToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); + +VOID +SepUpdatePrivilegeFlagsToken( + _Inout_ PTOKEN Token); + +VOID +SepRemovePrivilegeToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); + +VOID +SepRemoveUserGroupToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); BOOLEAN NTAPI -SeRmInitPhase0(VOID); +SeTokenCanImpersonate( + _In_ PTOKEN ProcessToken, + _In_ PTOKEN TokenToImpersonate, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); -BOOLEAN +VOID NTAPI -SeRmInitPhase1(VOID); +SeGetTokenControlInformation( + _In_ PACCESS_TOKEN _Token, + _Out_ PTOKEN_CONTROL TokenControl); VOID NTAPI @@ -330,23 +416,6 @@ SeSubProcessToken( _In_ BOOLEAN InUse, _In_ ULONG SessionId); -NTSTATUS -NTAPI -SeInitializeProcessAuditName( - _In_ PFILE_OBJECT FileObject, - _In_ BOOLEAN DoAudit, - _Out_ POBJECT_NAME_INFORMATION *AuditInfo); - -NTSTATUS -NTAPI -SeCreateAccessStateEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _In_ OUT PACCESS_STATE AccessState, - _In_ PAUX_ACCESS_DATA AuxData, - _In_ ACCESS_MASK Access, - _In_ PGENERIC_MAPPING GenericMapping); - NTSTATUS NTAPI SeIsTokenChild( @@ -361,87 +430,63 @@ SeIsTokenSibling( NTSTATUS NTAPI -SepCreateImpersonationTokenDacl( - _In_ PTOKEN Token, - _In_ PTOKEN PrimaryToken, - _Out_ PACL* Dacl); - -NTSTATUS -NTAPI -SepRmInsertLogonSessionIntoToken( - _Inout_ PTOKEN Token); +SeExchangePrimaryToken( + _In_ PEPROCESS Process, + _In_ PACCESS_TOKEN NewAccessToken, + _Out_ PACCESS_TOKEN* OldAccessToken); NTSTATUS NTAPI -SepRmRemoveLogonSessionFromToken( - _Inout_ PTOKEN Token); - -CODE_SEG("INIT") -VOID -NTAPI -SepInitializeTokenImplementation(VOID); - -CODE_SEG("INIT") -PTOKEN -NTAPI -SepCreateSystemProcessToken(VOID); +SeCopyClientToken( + _In_ PACCESS_TOKEN Token, + _In_ SECURITY_IMPERSONATION_LEVEL Level, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ PACCESS_TOKEN* NewToken); -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonToken(VOID); +ULONG +RtlLengthSidAndAttributes( + _In_ ULONG Count, + _In_ PSID_AND_ATTRIBUTES Src); +// +// Security Manager (SeMgr) functions +// CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonTokenNoEveryone(VOID); - BOOLEAN NTAPI -SeDetailedAuditingWithToken( - _In_ PTOKEN Token); - -VOID -NTAPI -SeAuditProcessExit( - _In_ PEPROCESS Process); - -VOID -NTAPI -SeAuditProcessCreate( - _In_ PEPROCESS Process); +SeInitSystem(VOID); NTSTATUS NTAPI -SeExchangePrimaryToken( - _In_ PEPROCESS Process, - _In_ PACCESS_TOKEN NewAccessToken, - _Out_ PACCESS_TOKEN* OldAccessToken); +SeDefaultObjectMethod( + _In_ PVOID Object, + _In_ SECURITY_OPERATION_CODE OperationType, + _In_ PSECURITY_INFORMATION SecurityInformation, + _Inout_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_opt_ PULONG ReturnLength, + _Inout_opt_ PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping); VOID NTAPI -SeCaptureSubjectContextEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext); +SeQuerySecurityAccessMask( + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PACCESS_MASK DesiredAccess); -NTSTATUS +VOID NTAPI -SeCaptureLuidAndAttributesArray( - _In_ PLUID_AND_ATTRIBUTES Src, - _In_ ULONG PrivilegeCount, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ PLUID_AND_ATTRIBUTES AllocatedMem, - _In_ ULONG AllocatedLength, - _In_ POOL_TYPE PoolType, - _In_ BOOLEAN CaptureIfKernel, - _Out_ PLUID_AND_ATTRIBUTES* Dest, - _Inout_ PULONG Length); +SeSetSecurityAccessMask( + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PACCESS_MASK DesiredAccess); +// +// Privilege functions +// +CODE_SEG("INIT") VOID NTAPI -SeReleaseLuidAndAttributesArray( - _In_ PLUID_AND_ATTRIBUTES Privilege, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ BOOLEAN CaptureIfKernel); +SepInitPrivileges(VOID); BOOLEAN NTAPI @@ -462,6 +507,12 @@ SePrivilegePolicyCheck( _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet, _In_ KPROCESSOR_MODE PreviousMode); +BOOLEAN +NTAPI +SeCheckAuditPrivilege( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ KPROCESSOR_MODE PreviousMode); + BOOLEAN NTAPI SeCheckPrivilegedObject( @@ -472,32 +523,32 @@ SeCheckPrivilegedObject( NTSTATUS NTAPI -SepDuplicateToken( - _In_ PTOKEN Token, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ BOOLEAN EffectiveOnly, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL Level, +SeCaptureLuidAndAttributesArray( + _In_ PLUID_AND_ATTRIBUTES Src, + _In_ ULONG PrivilegeCount, _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN* NewAccessToken); - -NTSTATUS -NTAPI -SepCaptureSecurityQualityOfService( - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ KPROCESSOR_MODE AccessMode, + _In_ PLUID_AND_ATTRIBUTES AllocatedMem, + _In_ ULONG AllocatedLength, _In_ POOL_TYPE PoolType, _In_ BOOLEAN CaptureIfKernel, - _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, - _Out_ PBOOLEAN Present); + _Out_ PLUID_AND_ATTRIBUTES* Dest, + _Inout_ PULONG Length); VOID NTAPI -SepReleaseSecurityQualityOfService( - _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, - _In_ KPROCESSOR_MODE AccessMode, +SeReleaseLuidAndAttributesArray( + _In_ PLUID_AND_ATTRIBUTES Privilege, + _In_ KPROCESSOR_MODE PreviousMode, _In_ BOOLEAN CaptureIfKernel); +// +// SID functions +// +CODE_SEG("INIT") +BOOLEAN +NTAPI +SepInitSecurityIDs(VOID); + NTSTATUS NTAPI SepCaptureSid( @@ -514,6 +565,21 @@ SepReleaseSid( _In_ KPROCESSOR_MODE AccessMode, _In_ BOOLEAN CaptureIfKernel); +BOOLEAN +NTAPI +SepSidInToken( + _In_ PACCESS_TOKEN _Token, + _In_ PSID Sid); + +BOOLEAN +NTAPI +SepSidInTokenEx( + _In_ PACCESS_TOKEN _Token, + _In_ PSID PrincipalSelfSid, + _In_ PSID _Sid, + _In_ BOOLEAN Deny, + _In_ BOOLEAN Restricted); + PSID NTAPI SepGetSidFromAce( @@ -540,11 +606,20 @@ SeReleaseSidAndAttributesArray( _In_ KPROCESSOR_MODE AccessMode, _In_ BOOLEAN CaptureIfKernel); +// +// ACL functions +// +CODE_SEG("INIT") +BOOLEAN +NTAPI +SepInitDACLs(VOID); + NTSTATUS NTAPI -SeComputeQuotaInformationSize( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _Out_ PULONG QuotaInfoSize); +SepCreateImpersonationTokenDacl( + _In_ PTOKEN Token, + _In_ PTOKEN PrimaryToken, + _Out_ PACL* Dacl); NTSTATUS NTAPI @@ -588,17 +663,13 @@ SepSelectAcl( _In_ BOOLEAN IsDirectoryObject, _In_ PGENERIC_MAPPING GenericMapping); -NTSTATUS +// +// SD functions +// +CODE_SEG("INIT") +BOOLEAN NTAPI -SeDefaultObjectMethod( - _In_ PVOID Object, - _In_ SECURITY_OPERATION_CODE OperationType, - _In_ PSECURITY_INFORMATION SecurityInformation, - _Inout_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _Inout_opt_ PULONG ReturnLength, - _Inout_opt_ PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - _In_ POOL_TYPE PoolType, - _In_ PGENERIC_MAPPING GenericMapping); +SepInitSDs(VOID); NTSTATUS NTAPI @@ -609,11 +680,38 @@ SeSetWorldSecurityDescriptor( NTSTATUS NTAPI -SeCopyClientToken( - _In_ PACCESS_TOKEN Token, - _In_ SECURITY_IMPERSONATION_LEVEL Level, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PACCESS_TOKEN* NewToken); +SeComputeQuotaInformationSize( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PULONG QuotaInfoSize); + +// +// Security Reference Monitor (SeRm) functions +// +BOOLEAN +NTAPI +SeRmInitPhase0(VOID); + +BOOLEAN +NTAPI +SeRmInitPhase1(VOID); + +NTSTATUS +NTAPI +SepRmInsertLogonSessionIntoToken( + _Inout_ PTOKEN Token); + +NTSTATUS +NTAPI +SepRmRemoveLogonSessionFromToken( + _Inout_ PTOKEN Token); + +NTSTATUS +SepRmReferenceLogonSession( + _Inout_ PLUID LogonLuid); + +NTSTATUS +SepRmDereferenceLogonSession( + _Inout_ PLUID LogonLuid); NTSTATUS NTAPI @@ -624,31 +722,36 @@ SepRegQueryHelper( _In_ ULONG DataLength, _Out_ PVOID ValueData); -VOID +NTSTATUS NTAPI -SeQuerySecurityAccessMask( - _In_ SECURITY_INFORMATION SecurityInformation, - _Out_ PACCESS_MASK DesiredAccess); +SeGetLogonIdDeviceMap( + _In_ PLUID LogonId, + _Out_ PDEVICE_MAP *DeviceMap); -VOID +// +// Audit functions +// +NTSTATUS NTAPI -SeSetSecurityAccessMask( - _In_ SECURITY_INFORMATION SecurityInformation, - _Out_ PACCESS_MASK DesiredAccess); +SeInitializeProcessAuditName( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN DoAudit, + _Out_ POBJECT_NAME_INFORMATION *AuditInfo); BOOLEAN NTAPI -SeFastTraverseCheck( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PACCESS_STATE AccessState, - _In_ ACCESS_MASK DesiredAccess, - _In_ KPROCESSOR_MODE AccessMode); +SeDetailedAuditingWithToken( + _In_ PTOKEN Token); -BOOLEAN +VOID NTAPI -SeCheckAuditPrivilege( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, - _In_ KPROCESSOR_MODE PreviousMode); +SeAuditProcessExit( + _In_ PEPROCESS Process); + +VOID +NTAPI +SeAuditProcessCreate( + _In_ PEPROCESS Process); VOID NTAPI @@ -658,19 +761,74 @@ SePrivilegedServiceAuditAlarm( _In_ PPRIVILEGE_SET PrivilegeSet, _In_ BOOLEAN AccessGranted); +// +// Subject functions +// +VOID +NTAPI +SeCaptureSubjectContextEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext); + +// +// Security Quality of Service (SQoS) functions +// NTSTATUS -SepRmReferenceLogonSession( - _Inout_ PLUID LogonLuid); +NTAPI +SepCaptureSecurityQualityOfService( + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, + _Out_ PBOOLEAN Present); + +VOID +NTAPI +SepReleaseSecurityQualityOfService( + _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel); +// +// Object type list functions +// NTSTATUS -SepRmDereferenceLogonSession( - _Inout_ PLUID LogonLuid); +SeCaptureObjectTypeList( + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList); +VOID +SeReleaseObjectTypeList( + _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ KPROCESSOR_MODE PreviousMode); + +// +// Access state functions +// NTSTATUS NTAPI -SeGetLogonIdDeviceMap( - _In_ PLUID LogonId, - _Out_ PDEVICE_MAP *DeviceMap); +SeCreateAccessStateEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _In_ OUT PACCESS_STATE AccessState, + _In_ PAUX_ACCESS_DATA AuxData, + _In_ ACCESS_MASK Access, + _In_ PGENERIC_MAPPING GenericMapping); + +// +// Access check functions +// +BOOLEAN +NTAPI +SeFastTraverseCheck( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PACCESS_STATE AccessState, + _In_ ACCESS_MASK DesiredAccess, + _In_ KPROCESSOR_MODE AccessMode); #endif diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 2284563e436..af8217bc480 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -275,13 +275,19 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/se/accesschk.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/acl.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/audit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/client.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/objtype.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/priv.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sd.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/semgr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sqos.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/srm.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/subject.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokenadj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokencls.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokenlif.c ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/guidobj.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/smbios.c diff --git a/ntoskrnl/se/access.c b/ntoskrnl/se/access.c index 98b00a70d1e..77100336509 100644 --- a/ntoskrnl/se/access.c +++ b/ntoskrnl/se/access.c @@ -11,529 +11,8 @@ #define NDEBUG #include <debug.h> -/* GLOBALS ********************************************************************/ - -ERESOURCE SepSubjectContextLock; - -/* PRIVATE FUNCTIONS **********************************************************/ - -/** - * @brief - * Checks if a SID is present in a token. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] PrincipalSelfSid - * A principal self SID. - * - * @param[in] _Sid - * A regular SID. - * - * @param[in] Deny - * If set to TRUE, the caller expected that a SID in a token - * must be a deny-only SID, that is, access checks are performed - * only for deny-only ACEs of the said SID. - * - * @param[in] Restricted - * If set to TRUE, the caller expects that a SID in a token is - * restricted (by the general definition, a token is restricted). - * - * @return - * Returns TRUE if the specified SID in the call is present in the token, - * FALSE otherwise. - */ -BOOLEAN -NTAPI -SepSidInTokenEx( - _In_ PACCESS_TOKEN _Token, - _In_ PSID PrincipalSelfSid, - _In_ PSID _Sid, - _In_ BOOLEAN Deny, - _In_ BOOLEAN Restricted) -{ - ULONG SidIndex; - PTOKEN Token = (PTOKEN)_Token; - PISID TokenSid, Sid = (PISID)_Sid; - PSID_AND_ATTRIBUTES SidAndAttributes; - ULONG SidCount, SidLength; - USHORT SidMetadata; - PAGED_CODE(); - - /* Check if a principal SID was given, and this is our current SID already */ - if ((PrincipalSelfSid) && (RtlEqualSid(SePrincipalSelfSid, Sid))) - { - /* Just use the principal SID in this case */ - Sid = PrincipalSelfSid; - } - - /* Check if this is a restricted token or not */ - if (Restricted) - { - /* Use the restricted SIDs and count */ - SidAndAttributes = Token->RestrictedSids; - SidCount = Token->RestrictedSidCount; - } - else - { - /* Use the normal SIDs and count */ - SidAndAttributes = Token->UserAndGroups; - SidCount = Token->UserAndGroupCount; - } - - /* Do checks here by hand instead of the usual 4 function calls */ - SidLength = FIELD_OFFSET(SID, - SubAuthority[Sid->SubAuthorityCount]); - SidMetadata = *(PUSHORT)&Sid->Revision; - - /* Loop every SID */ - for (SidIndex = 0; SidIndex < SidCount; SidIndex++) - { - TokenSid = (PISID)SidAndAttributes->Sid; -#if SE_SID_DEBUG - UNICODE_STRING sidString; - RtlConvertSidToUnicodeString(&sidString, TokenSid, TRUE); - DPRINT1("SID in Token: %wZ\n", &sidString); - RtlFreeUnicodeString(&sidString); -#endif - /* Check if the SID metadata matches */ - if (*(PUSHORT)&TokenSid->Revision == SidMetadata) - { - /* Check if the SID data matches */ - if (RtlEqualMemory(Sid, TokenSid, SidLength)) - { - /* - * Check if the group is enabled, or used for deny only. - * Otherwise we have to check if this is the first user. - * We understand that by looking if this SID is not - * restricted, this is the first element we are iterating - * and that it doesn't have SE_GROUP_USE_FOR_DENY_ONLY - * attribute. - */ - if ((!Restricted && (SidIndex == 0) && !(SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY)) || - (SidAndAttributes->Attributes & SE_GROUP_ENABLED) || - ((Deny) && (SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY))) - { - /* SID is present */ - return TRUE; - } - else - { - /* SID is not present */ - return FALSE; - } - } - } - - /* Move to the next SID */ - SidAndAttributes++; - } - - /* SID is not present */ - return FALSE; -} - -/** - * @brief - * Checks if a SID is present in a token. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] _Sid - * A regular SID. - * - * @return - * Returns TRUE if the specified SID in the call is present in the token, - * FALSE otherwise. - */ -BOOLEAN -NTAPI -SepSidInToken( - _In_ PACCESS_TOKEN _Token, - _In_ PSID Sid) -{ - /* Call extended API */ - return SepSidInTokenEx(_Token, NULL, Sid, FALSE, FALSE); -} - -/** - * @brief - * Checks if a token belongs to the main user, being the owner. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] SecurityDescriptor - * A security descriptor where the owner is to be found. - * - * @param[in] TokenLocked - * If set to TRUE, the token has been already locked and there's - * no need to lock it again. Otherwise the function will acquire - * the lock. - * - * @return - * Returns TRUE if the token belongs to a owner, FALSE otherwise. - */ -BOOLEAN -NTAPI -SepTokenIsOwner( - _In_ PACCESS_TOKEN _Token, - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ BOOLEAN TokenLocked) -{ - PSID Sid; - BOOLEAN Result; - PTOKEN Token = _Token; - - /* Get the owner SID */ - Sid = SepGetOwnerFromDescriptor(SecurityDescriptor); - ASSERT(Sid != NULL); - - /* Lock the token if needed */ - if (!TokenLocked) SepAcquireTokenLockShared(Token); - - /* Check if the owner SID is found, handling restricted case as well */ - Result = SepSidInToken(Token, Sid); - if ((Result) && (Token->TokenFlags & TOKEN_IS_RESTRICTED)) - { - Result = SepSidInTokenEx(Token, NULL, Sid, FALSE, TRUE); - } - - /* Release the lock if we had acquired it */ - if (!TokenLocked) SepReleaseTokenLock(Token); - - /* Return the result */ - return Result; -} - -/** - * @brief - * Retrieves token control information. - * - * @param[in] _Token - * A valid token object. - * - * @param[out] SecurityDescriptor - * The returned token control information. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeGetTokenControlInformation( - _In_ PACCESS_TOKEN _Token, - _Out_ PTOKEN_CONTROL TokenControl) -{ - PTOKEN Token = _Token; - PAGED_CODE(); - - /* Capture the main fields */ - TokenControl->AuthenticationId = Token->AuthenticationId; - TokenControl->TokenId = Token->TokenId; - TokenControl->TokenSource = Token->TokenSource; - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - /* Capture the modified ID */ - TokenControl->ModifiedId = Token->ModifiedId; - - /* Unlock it */ - SepReleaseTokenLock(Token); -} - -/** - * @brief - * Creates a client security context based upon an access token. - * - * @param[in] Token - * A valid token object. - * - * @param[in] ClientSecurityQos - * The Quality of Service (QoS) of a client security context. - * - * @param[in] ServerIsRemote - * If the client is a remote server (TRUE), the function will retrieve the - * control information of an access token, that is, we're doing delegation - * and that the server isn't local. - * - * @param[in] TokenType - * Type of token. - * - * @param[in] ThreadEffectiveOnly - * If set to TRUE, the client wants that the current thread wants to modify - * (enable or disable) privileges and groups. - * - * @param[in] ImpersonationLevel - * Security impersonation level filled in the QoS context. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * Returns STATUS_SUCCESS if client security creation has completed successfully. - * STATUS_INVALID_PARAMETER is returned if one or more of the parameters are bogus. - * STATUS_BAD_IMPERSONATION_LEVEL is returned if the current impersonation level - * within QoS context doesn't meet with the conditions required. A failure - * NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SepCreateClientSecurity( - _In_ PACCESS_TOKEN Token, - _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - _In_ BOOLEAN ServerIsRemote, - _In_ TOKEN_TYPE TokenType, - _In_ BOOLEAN ThreadEffectiveOnly, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - NTSTATUS Status; - PACCESS_TOKEN NewToken; - PAGED_CODE(); - - /* Check for bogus impersonation level */ - if (!VALID_IMPERSONATION_LEVEL(ClientSecurityQos->ImpersonationLevel)) - { - /* Fail the call */ - return STATUS_INVALID_PARAMETER; - } - - /* Check what kind of token this is */ - if (TokenType != TokenImpersonation) - { - /* On a primary token, if we do direct access, copy the flag from the QOS */ - ClientContext->DirectAccessEffectiveOnly = ClientSecurityQos->EffectiveOnly; - } - else - { - /* This is an impersonation token, is the level ok? */ - if (ClientSecurityQos->ImpersonationLevel > ImpersonationLevel) - { - /* Nope, fail */ - return STATUS_BAD_IMPERSONATION_LEVEL; - } - - /* Is the level too low, or are we doing something other than delegation remotely */ - if ((ImpersonationLevel == SecurityAnonymous) || - (ImpersonationLevel == SecurityIdentification) || - ((ServerIsRemote) && (ImpersonationLevel != SecurityDelegation))) - { - /* Fail the call */ - return STATUS_BAD_IMPERSONATION_LEVEL; - } - - /* Pick either the thread setting or the QOS setting */ - ClientContext->DirectAccessEffectiveOnly = - ((ThreadEffectiveOnly) || (ClientSecurityQos->EffectiveOnly)) ? TRUE : FALSE; - } - - /* Is this static tracking */ - if (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING) - { - /* Do not use direct access and make a copy */ - ClientContext->DirectlyAccessClientToken = FALSE; - Status = SeCopyClientToken(Token, - ClientSecurityQos->ImpersonationLevel, - KernelMode, - &NewToken); - if (!NT_SUCCESS(Status)) - return Status; - } - else - { - /* Use direct access and check if this is local */ - ClientContext->DirectlyAccessClientToken = TRUE; - if (ServerIsRemote) - { - /* We are doing delegation, so make a copy of the control data */ - SeGetTokenControlInformation(Token, - &ClientContext->ClientTokenControl); - } - - /* Keep the same token */ - NewToken = Token; - } - - /* Fill out the context and return success */ - ClientContext->SecurityQos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); - ClientContext->SecurityQos.ImpersonationLevel = ClientSecurityQos->ImpersonationLevel; - ClientContext->SecurityQos.ContextTrackingMode = ClientSecurityQos->ContextTrackingMode; - ClientContext->SecurityQos.EffectiveOnly = ClientSecurityQos->EffectiveOnly; - ClientContext->ServerIsRemote = ServerIsRemote; - ClientContext->ClientToken = NewToken; - return STATUS_SUCCESS; -} - /* PUBLIC FUNCTIONS ***********************************************************/ -/** - * @brief - * An extended function that captures the security subject context based upon - * the specified thread and process. - * - * @param[in] Thread - * A thread where the calling thread's token is to be referenced for - * the security context. - * - * @param[in] Process - * A process where the main process' token is to be referenced for - * the security context. - * - * @param[out] SubjectContext - * The returned security subject context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeCaptureSubjectContextEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - BOOLEAN CopyOnOpen, EffectiveOnly; - - PAGED_CODE(); - - /* Save the unique ID */ - SubjectContext->ProcessAuditId = Process->UniqueProcessId; - - /* Check if we have a thread */ - if (!Thread) - { - /* We don't, so no token */ - SubjectContext->ClientToken = NULL; - } - else - { - /* Get the impersonation token */ - SubjectContext->ClientToken = PsReferenceImpersonationToken(Thread, - &CopyOnOpen, - &EffectiveOnly, - &SubjectContext->ImpersonationLevel); - } - - /* Get the primary token */ - SubjectContext->PrimaryToken = PsReferencePrimaryToken(Process); -} - -/** - * @brief - * Captures the security subject context of the calling thread and calling - * process. - * - * @param[out] SubjectContext - * The returned security subject context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeCaptureSubjectContext( - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - /* Call the extended API */ - SeCaptureSubjectContextEx(PsGetCurrentThread(), - PsGetCurrentProcess(), - SubjectContext); -} - -/** - * @brief - * Locks both the referenced primary and client access tokens of a - * security subject context. - * - * @param[in] SubjectContext - * A valid security context with both referenced tokens. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeLockSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PTOKEN PrimaryToken, ClientToken; - PAGED_CODE(); - - /* Read both tokens */ - PrimaryToken = SubjectContext->PrimaryToken; - ClientToken = SubjectContext->ClientToken; - - /* Always lock the primary */ - SepAcquireTokenLockShared(PrimaryToken); - - /* Lock the impersonation one if it's there */ - if (!ClientToken) return; - SepAcquireTokenLockShared(ClientToken); -} - -/** - * @brief - * Unlocks both the referenced primary and client access tokens of a - * security subject context. - * - * @param[in] SubjectContext - * A valid security context with both referenced tokens. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeUnlockSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PTOKEN PrimaryToken, ClientToken; - PAGED_CODE(); - - /* Read both tokens */ - PrimaryToken = SubjectContext->PrimaryToken; - ClientToken = SubjectContext->ClientToken; - - /* Unlock the impersonation one if it's there */ - if (ClientToken) - { - SepReleaseTokenLock(ClientToken); - } - - /* Always unlock the primary one */ - SepReleaseTokenLock(PrimaryToken); -} - -/** - * @brief - * Releases both the primary and client tokens of a security - * subject context. - * - * @param[in] SubjectContext - * The captured security context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeReleaseSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PAGED_CODE(); - - /* Drop reference on the primary */ - ObFastDereferenceObject(&PsGetCurrentProcess()->Token, SubjectContext->PrimaryToken); - SubjectContext->PrimaryToken = NULL; - - /* Drop reference on the impersonation, if there was one */ - PsDereferenceImpersonationToken(SubjectContext->ClientToken); - SubjectContext->ClientToken = NULL; -} - /** * @brief * An extended function that creates an access state. @@ -721,194 +200,4 @@ SeSetAccessStateGenericMapping( ((PAUX_ACCESS_DATA)AccessState->AuxData)->GenericMapping = *GenericMapping; } -/** - * @brief - * Creates a client security context. - * - * @param[in] Thread - * Thread object of the client where impersonation has to begin. - * - * @param[in] Qos - * Quality of service to specify what kind of impersonation to be done. - * - * @param[in] RemoteClient - * If set to TRUE, the client that we're going to impersonate is remote. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * See SepCreateClientSecurity. - */ -NTSTATUS -NTAPI -SeCreateClientSecurity( - _In_ PETHREAD Thread, - _In_ PSECURITY_QUALITY_OF_SERVICE Qos, - _In_ BOOLEAN RemoteClient, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - TOKEN_TYPE TokenType; - BOOLEAN ThreadEffectiveOnly; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - PACCESS_TOKEN Token; - NTSTATUS Status; - PAGED_CODE(); - - /* Reference the correct token */ - Token = PsReferenceEffectiveToken(Thread, - &TokenType, - &ThreadEffectiveOnly, - &ImpersonationLevel); - - /* Create client security from it */ - Status = SepCreateClientSecurity(Token, - Qos, - RemoteClient, - TokenType, - ThreadEffectiveOnly, - ImpersonationLevel, - ClientContext); - - /* Check if we failed or static tracking was used */ - if (!(NT_SUCCESS(Status)) || (Qos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) - { - /* Dereference our copy since it's not being used */ - ObDereferenceObject(Token); - } - - /* Return status */ - return Status; -} - -/** - * @brief - * Creates a client security context based upon the captured security - * subject context. - * - * @param[in] SubjectContext - * The captured subject context where client security is to be created - * from. - * - * @param[in] ClientSecurityQos - * Quality of service to specify what kind of impersonation to be done. - * - * @param[in] ServerIsRemote - * If set to TRUE, the client that we're going to impersonate is remote. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * See SepCreateClientSecurity. - */ -NTSTATUS -NTAPI -SeCreateClientSecurityFromSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, - _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - _In_ BOOLEAN ServerIsRemote, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - PACCESS_TOKEN Token; - NTSTATUS Status; - PAGED_CODE(); - - /* Get the right token and reference it */ - Token = SeQuerySubjectContextToken(SubjectContext); - ObReferenceObject(Token); - - /* Create the context */ - Status = SepCreateClientSecurity(Token, - ClientSecurityQos, - ServerIsRemote, - SubjectContext->ClientToken ? - TokenImpersonation : TokenPrimary, - FALSE, - SubjectContext->ImpersonationLevel, - ClientContext); - - /* Check if we failed or static tracking was used */ - if (!(NT_SUCCESS(Status)) || - (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) - { - /* Dereference our copy since it's not being used */ - ObDereferenceObject(Token); - } - - /* Return status */ - return Status; -} - -/** - * @brief - * Extended function that impersonates a client. - * - * @param[in] ClientContext - * A valid client context. - * - * @param[in] ServerThread - * The thread where impersonation is to be done. - * - * @return - * STATUS_SUCCESS is returned if the calling thread successfully impersonates - * the client. A failure NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SeImpersonateClientEx( - _In_ PSECURITY_CLIENT_CONTEXT ClientContext, - _In_opt_ PETHREAD ServerThread) -{ - BOOLEAN EffectiveOnly; - PAGED_CODE(); - - /* Check if direct access is requested */ - if (!ClientContext->DirectlyAccessClientToken) - { - /* No, so get the flag from QOS */ - EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; - } - else - { - /* Yes, so see if direct access should be effective only */ - EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; - } - - /* Use the current thread if one was not passed */ - if (!ServerThread) ServerThread = PsGetCurrentThread(); - - /* Call the lower layer routine */ - return PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - TRUE, - EffectiveOnly, - ClientContext->SecurityQos.ImpersonationLevel); -} - -/** - * @brief - * Impersonates a client user. - * - * @param[in] ClientContext - * A valid client context. - * - * @param[in] ServerThread - * The thread where impersonation is to be done. - * * - * @return - * Nothing. - */ -VOID -NTAPI -SeImpersonateClient( - _In_ PSECURITY_CLIENT_CONTEXT ClientContext, - _In_opt_ PETHREAD ServerThread) -{ - PAGED_CODE(); - - /* Call the new API */ - SeImpersonateClientEx(ClientContext, ServerThread); -} - /* EOF */ diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index 0d993a1761d..a201e214907 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -16,7 +16,7 @@ UNICODE_STRING SeSubsystemName = RTL_CONSTANT_STRING(L"Security"); -/* PRIVATE FUNCTIONS***********************************************************/ +/* PRIVATE FUNCTIONS ***********************************************************/ /** * @unimplemented @@ -411,107 +411,6 @@ SePrivilegedServiceAuditAlarm( } -/** - * @brief - * Captures a list of object types. - * - * @param[in] ObjectTypeList - * An existing list of object types. - * - * @param[in] ObjectTypeListLength - * The length size of the list. - * - * @param[in] PreviousMode - * Processor access level mode. - * - * @param[out] CapturedObjectTypeList - * The captured list of object types. - * - * @return - * Returns STATUS_SUCCESS if the list of object types has been captured - * successfully. STATUS_INVALID_PARAMETER is returned if the caller hasn't - * supplied a buffer list of object types. STATUS_INSUFFICIENT_RESOURCES - * is returned if pool memory allocation for the captured list has failed. - */ -static -NTSTATUS -SeCaptureObjectTypeList( - _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeListLength, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList) -{ - SIZE_T Size; - - if (PreviousMode == KernelMode) - { - return STATUS_NOT_IMPLEMENTED; - } - - if (ObjectTypeListLength == 0) - { - *CapturedObjectTypeList = NULL; - return STATUS_SUCCESS; - } - - if (ObjectTypeList == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - /* Calculate the list size and check for integer overflow */ - Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); - if (Size == 0) - { - return STATUS_INVALID_PARAMETER; - } - - /* Allocate a new list */ - *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); - if (*CapturedObjectTypeList == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - _SEH2_TRY - { - ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); - RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); - *CapturedObjectTypeList = NULL; - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - return STATUS_SUCCESS; -} - -/** - * @brief - * Releases a buffer list of object types. - * - * @param[in] CapturedObjectTypeList - * A list of object types to free. - * - * @param[in] PreviousMode - * Processor access level mode. - * - * @return - * Nothing. - */ -static -VOID -SeReleaseObjectTypeList( - _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, - _In_ KPROCESSOR_MODE PreviousMode) -{ - if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL)) - ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA); -} - /** * @unimplemented * @brief diff --git a/ntoskrnl/se/client.c b/ntoskrnl/se/client.c new file mode 100644 index 00000000000..773428009a9 --- /dev/null +++ b/ntoskrnl/se/client.c @@ -0,0 +1,331 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security client support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS **********************************************************/ + +/** + * @brief + * Creates a client security context based upon an access token. + * + * @param[in] Token + * A valid token object. + * + * @param[in] ClientSecurityQos + * The Quality of Service (QoS) of a client security context. + * + * @param[in] ServerIsRemote + * If the client is a remote server (TRUE), the function will retrieve the + * control information of an access token, that is, we're doing delegation + * and that the server isn't local. + * + * @param[in] TokenType + * Type of token. + * + * @param[in] ThreadEffectiveOnly + * If set to TRUE, the client wants that the current thread wants to modify + * (enable or disable) privileges and groups. + * + * @param[in] ImpersonationLevel + * Security impersonation level filled in the QoS context. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * Returns STATUS_SUCCESS if client security creation has completed successfully. + * STATUS_INVALID_PARAMETER is returned if one or more of the parameters are bogus. + * STATUS_BAD_IMPERSONATION_LEVEL is returned if the current impersonation level + * within QoS context doesn't meet with the conditions required. A failure + * NTSTATUS code is returned otherwise. + */ +NTSTATUS +NTAPI +SepCreateClientSecurity( + _In_ PACCESS_TOKEN Token, + _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + _In_ BOOLEAN ServerIsRemote, + _In_ TOKEN_TYPE TokenType, + _In_ BOOLEAN ThreadEffectiveOnly, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + NTSTATUS Status; + PACCESS_TOKEN NewToken; + PAGED_CODE(); + + /* Check for bogus impersonation level */ + if (!VALID_IMPERSONATION_LEVEL(ClientSecurityQos->ImpersonationLevel)) + { + /* Fail the call */ + return STATUS_INVALID_PARAMETER; + } + + /* Check what kind of token this is */ + if (TokenType != TokenImpersonation) + { + /* On a primary token, if we do direct access, copy the flag from the QOS */ + ClientContext->DirectAccessEffectiveOnly = ClientSecurityQos->EffectiveOnly; + } + else + { + /* This is an impersonation token, is the level ok? */ + if (ClientSecurityQos->ImpersonationLevel > ImpersonationLevel) + { + /* Nope, fail */ + return STATUS_BAD_IMPERSONATION_LEVEL; + } + + /* Is the level too low, or are we doing something other than delegation remotely */ + if ((ImpersonationLevel == SecurityAnonymous) || + (ImpersonationLevel == SecurityIdentification) || + ((ServerIsRemote) && (ImpersonationLevel != SecurityDelegation))) + { + /* Fail the call */ + return STATUS_BAD_IMPERSONATION_LEVEL; + } + + /* Pick either the thread setting or the QOS setting */ + ClientContext->DirectAccessEffectiveOnly = + ((ThreadEffectiveOnly) || (ClientSecurityQos->EffectiveOnly)) ? TRUE : FALSE; + } + + /* Is this static tracking */ + if (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING) + { + /* Do not use direct access and make a copy */ + ClientContext->DirectlyAccessClientToken = FALSE; + Status = SeCopyClientToken(Token, + ClientSecurityQos->ImpersonationLevel, + KernelMode, + &NewToken); + if (!NT_SUCCESS(Status)) + return Status; + } + else + { + /* Use direct access and check if this is local */ + ClientContext->DirectlyAccessClientToken = TRUE; + if (ServerIsRemote) + { + /* We are doing delegation, so make a copy of the control data */ + SeGetTokenControlInformation(Token, + &ClientContext->ClientTokenControl); + } + + /* Keep the same token */ + NewToken = Token; + } + + /* Fill out the context and return success */ + ClientContext->SecurityQos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + ClientContext->SecurityQos.ImpersonationLevel = ClientSecurityQos->ImpersonationLevel; + ClientContext->SecurityQos.ContextTrackingMode = ClientSecurityQos->ContextTrackingMode; + ClientContext->SecurityQos.EffectiveOnly = ClientSecurityQos->EffectiveOnly; + ClientContext->ServerIsRemote = ServerIsRemote; + ClientContext->ClientToken = NewToken; + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * Creates a client security context. + * + * @param[in] Thread + * Thread object of the client where impersonation has to begin. + * + * @param[in] Qos + * Quality of service to specify what kind of impersonation to be done. + * + * @param[in] RemoteClient + * If set to TRUE, the client that we're going to impersonate is remote. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * See SepCreateClientSecurity. + */ +NTSTATUS +NTAPI +SeCreateClientSecurity( + _In_ PETHREAD Thread, + _In_ PSECURITY_QUALITY_OF_SERVICE Qos, + _In_ BOOLEAN RemoteClient, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + TOKEN_TYPE TokenType; + BOOLEAN ThreadEffectiveOnly; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + PACCESS_TOKEN Token; + NTSTATUS Status; + PAGED_CODE(); + + /* Reference the correct token */ + Token = PsReferenceEffectiveToken(Thread, + &TokenType, + &ThreadEffectiveOnly, + &ImpersonationLevel); + + /* Create client security from it */ + Status = SepCreateClientSecurity(Token, + Qos, + RemoteClient, + TokenType, + ThreadEffectiveOnly, + ImpersonationLevel, + ClientContext); + + /* Check if we failed or static tracking was used */ + if (!(NT_SUCCESS(Status)) || (Qos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) + { + /* Dereference our copy since it's not being used */ + ObDereferenceObject(Token); + } + + /* Return status */ + return Status; +} + +/** + * @brief + * Creates a client security context based upon the captured security + * subject context. + * + * @param[in] SubjectContext + * The captured subject context where client security is to be created + * from. + * + * @param[in] ClientSecurityQos + * Quality of service to specify what kind of impersonation to be done. + * + * @param[in] ServerIsRemote + * If set to TRUE, the client that we're going to impersonate is remote. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * See SepCreateClientSecurity. + */ +NTSTATUS +NTAPI +SeCreateClientSecurityFromSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + _In_ BOOLEAN ServerIsRemote, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + PACCESS_TOKEN Token; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the right token and reference it */ + Token = SeQuerySubjectContextToken(SubjectContext); + ObReferenceObject(Token); + + /* Create the context */ + Status = SepCreateClientSecurity(Token, + ClientSecurityQos, + ServerIsRemote, + SubjectContext->ClientToken ? + TokenImpersonation : TokenPrimary, + FALSE, + SubjectContext->ImpersonationLevel, + ClientContext); + + /* Check if we failed or static tracking was used */ + if (!(NT_SUCCESS(Status)) || + (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) + { + /* Dereference our copy since it's not being used */ + ObDereferenceObject(Token); + } + + /* Return status */ + return Status; +} + +/** + * @brief + * Extended function that impersonates a client. + * + * @param[in] ClientContext + * A valid client context. + * + * @param[in] ServerThread + * The thread where impersonation is to be done. + * + * @return + * STATUS_SUCCESS is returned if the calling thread successfully impersonates + * the client. A failure NTSTATUS code is returned otherwise. + */ +NTSTATUS +NTAPI +SeImpersonateClientEx( + _In_ PSECURITY_CLIENT_CONTEXT ClientContext, + _In_opt_ PETHREAD ServerThread) +{ + BOOLEAN EffectiveOnly; + PAGED_CODE(); + + /* Check if direct access is requested */ + if (!ClientContext->DirectlyAccessClientToken) + { + /* No, so get the flag from QOS */ + EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; + } + else + { + /* Yes, so see if direct access should be effective only */ + EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; + } + + /* Use the current thread if one was not passed */ + if (!ServerThread) ServerThread = PsGetCurrentThread(); + + /* Call the lower layer routine */ + return PsImpersonateClient(ServerThread, + ClientContext->ClientToken, + TRUE, + EffectiveOnly, + ClientContext->SecurityQos.ImpersonationLevel); +} + +/** + * @brief + * Impersonates a client user. + * + * @param[in] ClientContext + * A valid client context. + * + * @param[in] ServerThread + * The thread where impersonation is to be done. + * * + * @return + * Nothing. + */ +VOID +NTAPI +SeImpersonateClient( + _In_ PSECURITY_CLIENT_CONTEXT ClientContext, + _In_opt_ PETHREAD ServerThread) +{ + PAGED_CODE(); + + /* Call the new API */ + SeImpersonateClientEx(ClientContext, ServerThread); +} + +/* EOF */ diff --git a/ntoskrnl/se/objtype.c b/ntoskrnl/se/objtype.c new file mode 100644 index 00000000000..f4648d1a8ec --- /dev/null +++ b/ntoskrnl/se/objtype.c @@ -0,0 +1,115 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security object type list support routines + * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS ***********************************************************/ + +/** + * @brief + * Captures a list of object types. + * + * @param[in] ObjectTypeList + * An existing list of object types. + * + * @param[in] ObjectTypeListLength + * The length size of the list. + * + * @param[in] PreviousMode + * Processor access level mode. + * + * @param[out] CapturedObjectTypeList + * The captured list of object types. + * + * @return + * Returns STATUS_SUCCESS if the list of object types has been captured + * successfully. STATUS_INVALID_PARAMETER is returned if the caller hasn't + * supplied a buffer list of object types. STATUS_INSUFFICIENT_RESOURCES + * is returned if pool memory allocation for the captured list has failed. + */ +NTSTATUS +SeCaptureObjectTypeList( + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList) +{ + SIZE_T Size; + + if (PreviousMode == KernelMode) + { + return STATUS_NOT_IMPLEMENTED; + } + + if (ObjectTypeListLength == 0) + { + *CapturedObjectTypeList = NULL; + return STATUS_SUCCESS; + } + + if (ObjectTypeList == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Calculate the list size and check for integer overflow */ + Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); + if (Size == 0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate a new list */ + *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); + if (*CapturedObjectTypeList == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + _SEH2_TRY + { + ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); + RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); + *CapturedObjectTypeList = NULL; + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + +/** + * @brief + * Releases a buffer list of object types. + * + * @param[in] CapturedObjectTypeList + * A list of object types to free. + * + * @param[in] PreviousMode + * Processor access level mode. + * + * @return + * Nothing. + */ +VOID +SeReleaseObjectTypeList( + _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ KPROCESSOR_MODE PreviousMode) +{ + if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL)) + ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA); +} + +/* EOF */ diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 13aeba2662b..3d4d8931a15 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -412,6 +412,146 @@ SepReleaseSid( } } +/** + * @brief + * Checks if a SID is present in a token. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] PrincipalSelfSid + * A principal self SID. + * + * @param[in] _Sid + * A regular SID. + * + * @param[in] Deny + * If set to TRUE, the caller expected that a SID in a token + * must be a deny-only SID, that is, access checks are performed + * only for deny-only ACEs of the said SID. + * + * @param[in] Restricted + * If set to TRUE, the caller expects that a SID in a token is + * restricted (by the general definition, a token is restricted). + * + * @return + * Returns TRUE if the specified SID in the call is present in the token, + * FALSE otherwise. + */ +BOOLEAN +NTAPI +SepSidInTokenEx( + _In_ PACCESS_TOKEN _Token, + _In_ PSID PrincipalSelfSid, + _In_ PSID _Sid, + _In_ BOOLEAN Deny, + _In_ BOOLEAN Restricted) +{ + ULONG SidIndex; + PTOKEN Token = (PTOKEN)_Token; + PISID TokenSid, Sid = (PISID)_Sid; + PSID_AND_ATTRIBUTES SidAndAttributes; + ULONG SidCount, SidLength; + USHORT SidMetadata; + PAGED_CODE(); + + /* Check if a principal SID was given, and this is our current SID already */ + if ((PrincipalSelfSid) && (RtlEqualSid(SePrincipalSelfSid, Sid))) + { + /* Just use the principal SID in this case */ + Sid = PrincipalSelfSid; + } + + /* Check if this is a restricted token or not */ + if (Restricted) + { + /* Use the restricted SIDs and count */ + SidAndAttributes = Token->RestrictedSids; + SidCount = Token->RestrictedSidCount; + } + else + { + /* Use the normal SIDs and count */ + SidAndAttributes = Token->UserAndGroups; + SidCount = Token->UserAndGroupCount; + } + + /* Do checks here by hand instead of the usual 4 function calls */ + SidLength = FIELD_OFFSET(SID, + SubAuthority[Sid->SubAuthorityCount]); + SidMetadata = *(PUSHORT)&Sid->Revision; + + /* Loop every SID */ + for (SidIndex = 0; SidIndex < SidCount; SidIndex++) + { + TokenSid = (PISID)SidAndAttributes->Sid; +#if SE_SID_DEBUG + UNICODE_STRING sidString; + RtlConvertSidToUnicodeString(&sidString, TokenSid, TRUE); + DPRINT1("SID in Token: %wZ\n", &sidString); + RtlFreeUnicodeString(&sidString); +#endif + /* Check if the SID metadata matches */ + if (*(PUSHORT)&TokenSid->Revision == SidMetadata) + { + /* Check if the SID data matches */ + if (RtlEqualMemory(Sid, TokenSid, SidLength)) + { + /* + * Check if the group is enabled, or used for deny only. + * Otherwise we have to check if this is the first user. + * We understand that by looking if this SID is not + * restricted, this is the first element we are iterating + * and that it doesn't have SE_GROUP_USE_FOR_DENY_ONLY + * attribute. + */ + if ((!Restricted && (SidIndex == 0) && !(SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY)) || + (SidAndAttributes->Attributes & SE_GROUP_ENABLED) || + ((Deny) && (SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY))) + { + /* SID is present */ + return TRUE; + } + else + { + /* SID is not present */ + return FALSE; + } + } + } + + /* Move to the next SID */ + SidAndAttributes++; + } + + /* SID is not present */ + return FALSE; +} + +/** + * @brief + * Checks if a SID is present in a token. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] _Sid + * A regular SID. + * + * @return + * Returns TRUE if the specified SID in the call is present in the token, + * FALSE otherwise. + */ +BOOLEAN +NTAPI +SepSidInToken( + _In_ PACCESS_TOKEN _Token, + _In_ PSID Sid) +{ + /* Call extended API */ + return SepSidInTokenEx(_Token, NULL, Sid, FALSE, FALSE); +} + /** * @brief * Captures a security identifier from a diff --git a/ntoskrnl/se/subject.c b/ntoskrnl/se/subject.c new file mode 100644 index 00000000000..51a9e132028 --- /dev/null +++ b/ntoskrnl/se/subject.c @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security subject context support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +ERESOURCE SepSubjectContextLock; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * An extended function that captures the security subject context based upon + * the specified thread and process. + * + * @param[in] Thread + * A thread where the calling thread's token is to be referenced for + * the security context. + * + * @param[in] Process + * A process where the main process' token is to be referenced for + * the security context. + * + * @param[out] SubjectContext + * The returned security subject context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeCaptureSubjectContextEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + BOOLEAN CopyOnOpen, EffectiveOnly; + + PAGED_CODE(); + + /* Save the unique ID */ + SubjectContext->ProcessAuditId = Process->UniqueProcessId; + + /* Check if we have a thread */ + if (!Thread) + { + /* We don't, so no token */ + SubjectContext->ClientToken = NULL; + } + else + { + /* Get the impersonation token */ + SubjectContext->ClientToken = PsReferenceImpersonationToken(Thread, + &CopyOnOpen, + &EffectiveOnly, + &SubjectContext->ImpersonationLevel); + } + + /* Get the primary token */ + SubjectContext->PrimaryToken = PsReferencePrimaryToken(Process); +} + +/** + * @brief + * Captures the security subject context of the calling thread and calling + * process. + * + * @param[out] SubjectContext + * The returned security subject context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeCaptureSubjectContext( + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + /* Call the extended API */ + SeCaptureSubjectContextEx(PsGetCurrentThread(), + PsGetCurrentProcess(), + SubjectContext); +} + +/** + * @brief + * Locks both the referenced primary and client access tokens of a + * security subject context. + * + * @param[in] SubjectContext + * A valid security context with both referenced tokens. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeLockSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PTOKEN PrimaryToken, ClientToken; + PAGED_CODE(); + + /* Read both tokens */ + PrimaryToken = SubjectContext->PrimaryToken; + ClientToken = SubjectContext->ClientToken; + + /* Always lock the primary */ + SepAcquireTokenLockShared(PrimaryToken); + + /* Lock the impersonation one if it's there */ + if (!ClientToken) return; + SepAcquireTokenLockShared(ClientToken); +} + +/** + * @brief + * Unlocks both the referenced primary and client access tokens of a + * security subject context. + * + * @param[in] SubjectContext + * A valid security context with both referenced tokens. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeUnlockSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PTOKEN PrimaryToken, ClientToken; + PAGED_CODE(); + + /* Read both tokens */ + PrimaryToken = SubjectContext->PrimaryToken; + ClientToken = SubjectContext->ClientToken; + + /* Unlock the impersonation one if it's there */ + if (ClientToken) + { + SepReleaseTokenLock(ClientToken); + } + + /* Always unlock the primary one */ + SepReleaseTokenLock(PrimaryToken); +} + +/** + * @brief + * Releases both the primary and client tokens of a security + * subject context. + * + * @param[in] SubjectContext + * The captured security context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeReleaseSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PAGED_CODE(); + + /* Drop reference on the primary */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, SubjectContext->PrimaryToken); + SubjectContext->PrimaryToken = NULL; + + /* Drop reference on the impersonation, if there was one */ + PsDereferenceImpersonationToken(SubjectContext->ClientToken); + SubjectContext->ClientToken = NULL; +} + +/* EOF */ diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index e773358b356..83b962f1ba9 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security token implementation support + * PURPOSE: Security access token implementation base support routines * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ @@ -12,8 +12,6 @@ #define NDEBUG #include <debug.h> -#include <ntlsa.h> - /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; @@ -29,48 +27,7 @@ static GENERIC_MAPPING SepTokenMapping = { TOKEN_ALL_ACCESS }; -static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { - - /* Class 0 not used, blame MS! */ - IQS_NONE, - - /* TokenUser */ - IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenGroups */ - IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenPrivileges */ - IQS_SAME(TOKEN_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenOwner */ - IQS_SAME(TOKEN_OWNER, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenPrimaryGroup */ - IQS_SAME(TOKEN_PRIMARY_GROUP, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenDefaultDacl */ - IQS_SAME(TOKEN_DEFAULT_DACL, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenSource */ - IQS_SAME(TOKEN_SOURCE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenType */ - IQS_SAME(TOKEN_TYPE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenImpersonationLevel */ - IQS_SAME(SECURITY_IMPERSONATION_LEVEL, ULONG, ICIF_QUERY), - /* TokenStatistics */ - IQS_SAME(TOKEN_STATISTICS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenRestrictedSids */ - IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenSessionId */ - IQS_SAME(ULONG, ULONG, ICIF_QUERY | ICIF_SET), - /* TokenGroupsAndPrivileges */ - IQS_SAME(TOKEN_GROUPS_AND_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenSessionReference */ - IQS_SAME(ULONG, ULONG, ICIF_SET), - /* TokenSandBoxInert */ - IQS_SAME(ULONG, ULONG, ICIF_QUERY), - /* TokenAuditPolicy */ - IQS_SAME(TOKEN_AUDIT_POLICY_INFORMATION, ULONG, ICIF_SET | ICIF_SET_SIZE_VARIABLE), - /* TokenOrigin */ - IQS_SAME(TOKEN_ORIGIN, ULONG, ICIF_QUERY | ICIF_SET), -}; - -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *****************************************************************/ /** * @brief @@ -84,7 +41,6 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { * completed successfully, otherwise STATUS_INSUFFICIENT_RESOURCES on a * pool allocation failure. */ -static NTSTATUS SepCreateTokenLock( _Inout_ PTOKEN Token) @@ -114,7 +70,6 @@ SepCreateTokenLock( * @return * Nothing. */ -static VOID SepDeleteTokenLock( _Inout_ PTOKEN Token) @@ -483,7 +438,6 @@ SepImpersonateAnonymousToken( * @return * Nothing. */ -static VOID SepUpdateSinglePrivilegeFlagToken( _Inout_ PTOKEN Token, @@ -534,6 +488,56 @@ SepUpdateSinglePrivilegeFlagToken( } } +/** + * @brief + * Checks if a token belongs to the main user, being the owner. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] SecurityDescriptor + * A security descriptor where the owner is to be found. + * + * @param[in] TokenLocked + * If set to TRUE, the token has been already locked and there's + * no need to lock it again. Otherwise the function will acquire + * the lock. + * + * @return + * Returns TRUE if the token belongs to a owner, FALSE otherwise. + */ +BOOLEAN +NTAPI +SepTokenIsOwner( + _In_ PACCESS_TOKEN _Token, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN TokenLocked) +{ + PSID Sid; + BOOLEAN Result; + PTOKEN Token = _Token; + + /* Get the owner SID */ + Sid = SepGetOwnerFromDescriptor(SecurityDescriptor); + ASSERT(Sid != NULL); + + /* Lock the token if needed */ + if (!TokenLocked) SepAcquireTokenLockShared(Token); + + /* Check if the owner SID is found, handling restricted case as well */ + Result = SepSidInToken(Token, Sid); + if ((Result) && (Token->TokenFlags & TOKEN_IS_RESTRICTED)) + { + Result = SepSidInTokenEx(Token, NULL, Sid, FALSE, TRUE); + } + + /* Release the lock if we had acquired it */ + if (!TokenLocked) SepReleaseTokenLock(Token); + + /* Return the result */ + return Result; +} + /** * @brief * Updates the token's flags based upon the privilege that the token @@ -546,7 +550,6 @@ SepUpdateSinglePrivilegeFlagToken( * @return * Nothing. */ -static VOID SepUpdatePrivilegeFlagsToken( _Inout_ PTOKEN Token) @@ -575,7 +578,6 @@ SepUpdatePrivilegeFlagsToken( * @return * Nothing. */ -static VOID SepRemovePrivilegeToken( _Inout_ PTOKEN Token, @@ -612,7 +614,6 @@ SepRemovePrivilegeToken( * @return * Nothing. */ -static VOID SepRemoveUserGroupToken( _Inout_ PTOKEN Token, @@ -819,7 +820,7 @@ SeDeassignPrimaryToken( * @return * Returns the total length of a SID size. */ -static ULONG +ULONG RtlLengthSidAndAttributes( _In_ ULONG Count, _In_ PSID_AND_ATTRIBUTES Src) @@ -865,7 +866,7 @@ RtlLengthSidAndAttributes( * user from the token. STATUS_INVALID_PRIMARY_GROUP is returned if the specified default primary group does not match with the * other group from the token. */ -static NTSTATUS +NTSTATUS SepFindPrimaryGroupAndDefaultOwner( _In_ PTOKEN Token, _In_ PSID PrimaryGroup, @@ -959,349 +960,6 @@ SepFindPrimaryGroupAndDefaultOwner( return STATUS_SUCCESS; } -/** - * @brief - * Duplicates an access token, from an existing valid token. - * - * @param[in] Token - * Access token to duplicate. - * - * @param[in] ObjectAttributes - * Object attributes for the new token. - * - * @param[in] EffectiveOnly - * If set to TRUE, the function removes all the disabled privileges and groups of the token - * to duplicate. - * - * @param[in] TokenType - * Type of token. - * - * @param[in] Level - * Security impersonation level of a token. - * - * @param[in] PreviousMode - * The processor request level mode. - * - * @param[out] NewAccessToken - * The duplicated token. - * - * @return - * Returns STATUS_SUCCESS if the token has been duplicated. STATUS_INSUFFICIENT_RESOURCES is returned - * if memory pool allocation of the dynamic part of the token for duplication has failed due to the lack - * of memory resources. A failure NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SepDuplicateToken( - _In_ PTOKEN Token, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ BOOLEAN EffectiveOnly, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL Level, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN* NewAccessToken) -{ - NTSTATUS Status; - PTOKEN AccessToken; - PVOID EndMem; - ULONG PrimaryGroupIndex; - ULONG VariableLength; - ULONG TotalSize; - ULONG PrivilegesIndex, GroupsIndex; - - PAGED_CODE(); - - /* Compute how much size we need to allocate for the token */ - VariableLength = Token->VariableLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; - - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - TotalSize, - 0, - 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObCreateObject() failed (Status 0x%lx)\n", Status); - return Status; - } - - /* Zero out the buffer and initialize the token */ - RtlZeroMemory(AccessToken, TotalSize); - - ExAllocateLocallyUniqueId(&AccessToken->TokenId); - - AccessToken->TokenType = TokenType; - AccessToken->ImpersonationLevel = Level; - - /* Initialise the lock for the access token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(AccessToken); - return Status; - } - - /* Copy the immutable fields */ - AccessToken->TokenSource.SourceIdentifier = Token->TokenSource.SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); - - AccessToken->AuthenticationId = Token->AuthenticationId; - AccessToken->ParentTokenId = Token->ParentTokenId; - AccessToken->ExpirationTime = Token->ExpirationTime; - AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - - /* Lock the source token and copy the mutable fields */ - SepAcquireTokenLockShared(Token); - - AccessToken->SessionId = Token->SessionId; - AccessToken->ModifiedId = Token->ModifiedId; - - AccessToken->TokenFlags = Token->TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; - - /* Reference the logon session */ - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* No logon session could be found, bail out */ - DPRINT1("SepRmReferenceLogonSession() failed (Status 0x%lx)\n", Status); - /* Set the flag for proper cleanup by the delete procedure */ - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } - - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepRmInsertLogonSessionIntoToken() failed (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Fill in token debug information */ -#if DBG - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); - - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - AccessToken->CreateMethod = TOKEN_DUPLICATE_METHOD; -#endif - - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; - - /* Copy the privileges */ - AccessToken->PrivilegeCount = 0; - AccessToken->Privileges = NULL; - if (Token->Privileges && (Token->PrivilegeCount > 0)) - { - ULONG PrivilegesLength = Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - ASSERT(VariableLength >= PrivilegesLength); - - AccessToken->PrivilegeCount = Token->PrivilegeCount; - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; - - RtlCopyMemory(AccessToken->Privileges, - Token->Privileges, - AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 0; - AccessToken->UserAndGroups = NULL; - if (Token->UserAndGroups && (Token->UserAndGroupCount > 0)) - { - AccessToken->UserAndGroupCount = Token->UserAndGroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - VariableLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCopySidAndAttributesArray(UserAndGroups) failed (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* Find the token primary group */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - Token->PrimaryGroup, - NULL, - &PrimaryGroupIndex, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepFindPrimaryGroupAndDefaultOwner failed (Status 0x%lx)\n", Status); - goto Quit; - } - - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - - /* Copy the restricted SIDs */ - AccessToken->RestrictedSidCount = 0; - AccessToken->RestrictedSids = NULL; - if (Token->RestrictedSids && (Token->RestrictedSidCount > 0)) - { - AccessToken->RestrictedSidCount = Token->RestrictedSidCount; - AccessToken->RestrictedSids = EndMem; - EndMem = &AccessToken->RestrictedSids[AccessToken->RestrictedSidCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->RestrictedSids); - - Status = RtlCopySidAndAttributesArray(AccessToken->RestrictedSidCount, - Token->RestrictedSids, - VariableLength, - AccessToken->RestrictedSids, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCopySidAndAttributesArray(RestrictedSids) failed (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* - * Filter the token by removing the disabled privileges - * and groups if the caller wants to duplicate an access - * token as effective only. - */ - if (EffectiveOnly) - { - /* Begin querying the groups and search for disabled ones */ - for (GroupsIndex = 0; GroupsIndex < AccessToken->UserAndGroupCount; GroupsIndex++) - { - /* - * A group or user is considered disabled if its attributes is either - * 0 or SE_GROUP_ENABLED is not included in the attributes flags list. - * That is because a certain user and/or group can have several attributes - * that bear no influence on whether a user/group is enabled or not - * (SE_GROUP_ENABLED_BY_DEFAULT for example which is a mere indicator - * that the group has just been enabled by default). A mandatory - * group (that is, the group has SE_GROUP_MANDATORY attribute) - * by standards it's always enabled and no one can disable it. - */ - if (AccessToken->UserAndGroups[GroupsIndex].Attributes == 0 || - (AccessToken->UserAndGroups[GroupsIndex].Attributes & SE_GROUP_ENABLED) == 0) - { - /* - * If this group is an administrators group - * and the token belongs to such group, - * we've to take away TOKEN_HAS_ADMIN_GROUP - * for the fact that's not enabled and as - * such the token no longer belongs to - * this group. - */ - if (RtlEqualSid(SeAliasAdminsSid, - &AccessToken->UserAndGroups[GroupsIndex].Sid)) - { - AccessToken->TokenFlags &= ~TOKEN_HAS_ADMIN_GROUP; - } - - /* - * A group is not enabled, it's time to remove - * from the token and update the groups index - * accordingly and continue with the next group. - */ - SepRemoveUserGroupToken(AccessToken, GroupsIndex); - GroupsIndex--; - } - } - - /* Begin querying the privileges and search for disabled ones */ - for (PrivilegesIndex = 0; PrivilegesIndex < AccessToken->PrivilegeCount; PrivilegesIndex++) - { - /* - * A privilege is considered disabled if its attributes is either - * 0 or SE_PRIVILEGE_ENABLED is not included in the attributes flags list. - * That is because a certain privilege can have several attributes - * that bear no influence on whether a privilege is enabled or not - * (SE_PRIVILEGE_ENABLED_BY_DEFAULT for example which is a mere indicator - * that the privilege has just been enabled by default). - */ - if (AccessToken->Privileges[PrivilegesIndex].Attributes == 0 || - (AccessToken->Privileges[PrivilegesIndex].Attributes & SE_PRIVILEGE_ENABLED) == 0) - { - /* - * A privilege is not enabled, therefor it's time - * to strip it from the token and continue with the next - * privilege. Of course we must also want to update the - * privileges index accordingly. - */ - SepRemovePrivilegeToken(AccessToken, PrivilegesIndex); - PrivilegesIndex--; - } - } - } - - // - // NOTE: So far our dynamic area only contains - // the default dacl, so this makes the following - // code pretty simple. The day where it stores - // other data, the code will require adaptations. - // - - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; - if (Token->DynamicPart && Token->DefaultDacl) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; - - RtlCopyMemory(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - - /* Return the token to the caller */ - *NewAccessToken = AccessToken; - Status = STATUS_SUCCESS; - -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the token, the delete procedure will clean it up */ - ObDereferenceObject(AccessToken); - } - - /* Unlock the source token */ - SepReleaseTokenLock(Token); - - return Status; -} - /** * @brief * Subtracts a token in exchange of duplicating a new one. @@ -1638,1207 +1296,292 @@ SeAssignPrimaryToken( /** * @brief - * Internal function responsible for access token object creation in the kernel. - * A fully created token objected is inserted into the token handle, thus the handle - * becoming a valid handle to an access token object and ready for use. + * Retrieves token control information. * - * @param[out] TokenHandle - * Valid token handle that's ready for use after token creation and object insertion. - * - * @param[in] PreviousMode - * Processor request level mode. - * - * @param[in] DesiredAccess - * Desired access right for the token object to be granted. This kind of access right - * impacts how the token can be used and who. - * - * @param[in] ObjectAttributes - * Object attributes for the token to be created. - * - * @param[in] TokenType - * Type of token to assign upon creation. - * - * @param[in] ImpersonationLevel - * Security impersonation level of token to assign upon creation. - * - * @param[in] AuthenticationId - * Authentication ID that represents the authentication information of the token. - * - * @param[in] ExpirationTime - * Expiration time of the token to assign. A value of -1 means that the token never - * expires and its life depends upon the amount of references this token object has. - * - * @param[in] User - * User entry to assign to the token. - * - * @param[in] GroupCount - * The total number of groups count for the token. - * - * @param[in] Groups - * The group entries for the token. - * - * @param[in] GroupsLength - * The length size of the groups array, pointed by the Groups parameter. + * @param[in] _Token + * A valid token object. * - * @param[in] PrivilegeCount - * The total number of priivleges that the newly created token has. - * - * @param[in] Privileges - * The privileges for the token. - * - * @param[in] Owner - * The main user (or also owner) that represents the token that we create. - * - * @param[in] PrimaryGroup - * The main group that represents the token that we create. - * - * @param[in] DefaultDacl - * A discretionary access control list for the token. - * - * @param[in] TokenSource - * Source (or the origin) of the access token that creates it. - * - * @param[in] SystemToken - * If set to TRUE, the newly created token is a system token and only in charge - * by the internal system. The function directly returns a pointer to the - * created token object for system kernel use. Otherwise if set to FALSE, the - * function inserts the object to a handle making it a regular access token. + * @param[out] SecurityDescriptor + * The returned token control information. * * @return - * Returns STATUS_SUCCESS if token creation has completed successfully. - * STATUS_INSUFFICIENT_RESOURCES is returned if the dynamic area of memory of the - * token hasn't been allocated because of lack of memory resources. A failure - * NTSTATUS code is returned otherwise. + * Nothing. */ -NTSTATUS +VOID NTAPI -SepCreateToken( - _Out_ PHANDLE TokenHandle, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ ACCESS_MASK DesiredAccess, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, - _In_ PLUID AuthenticationId, - _In_ PLARGE_INTEGER ExpirationTime, - _In_ PSID_AND_ATTRIBUTES User, - _In_ ULONG GroupCount, - _In_ PSID_AND_ATTRIBUTES Groups, - _In_ ULONG GroupsLength, - _In_ ULONG PrivilegeCount, - _In_ PLUID_AND_ATTRIBUTES Privileges, - _In_opt_ PSID Owner, - _In_ PSID PrimaryGroup, - _In_opt_ PACL DefaultDacl, - _In_ PTOKEN_SOURCE TokenSource, - _In_ BOOLEAN SystemToken) +SeGetTokenControlInformation( + _In_ PACCESS_TOKEN _Token, + _Out_ PTOKEN_CONTROL TokenControl) { - NTSTATUS Status; - PTOKEN AccessToken; - ULONG TokenFlags = 0; - ULONG PrimaryGroupIndex, DefaultOwnerIndex; - LUID TokenId; - LUID ModifiedId; - PVOID EndMem; - ULONG PrivilegesLength; - ULONG UserGroupsLength; - ULONG VariableLength; - ULONG TotalSize; - ULONG i; - + PTOKEN Token = _Token; PAGED_CODE(); - /* Loop all groups */ - for (i = 0; i < GroupCount; i++) - { - /* Check for mandatory groups */ - if (Groups[i].Attributes & SE_GROUP_MANDATORY) - { - /* Force them to be enabled */ - Groups[i].Attributes |= (SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT); - } - - /* Check of the group is an admin group */ - if (RtlEqualSid(SeAliasAdminsSid, Groups[i].Sid)) - { - /* Remember this so we can optimize queries later */ - TokenFlags |= TOKEN_HAS_ADMIN_GROUP; - } - } - - /* Allocate unique IDs for the token */ - ExAllocateLocallyUniqueId(&TokenId); - ExAllocateLocallyUniqueId(&ModifiedId); - - /* Compute how much size we need to allocate for the token */ - - /* Privileges size */ - PrivilegesLength = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - /* User and groups size */ - UserGroupsLength = (1 + GroupCount) * sizeof(SID_AND_ATTRIBUTES); - UserGroupsLength += RtlLengthSid(User->Sid); - for (i = 0; i < GroupCount; i++) - { - UserGroupsLength += RtlLengthSid(Groups[i].Sid); - } - UserGroupsLength = ALIGN_UP_BY(UserGroupsLength, sizeof(PVOID)); + /* Capture the main fields */ + TokenControl->AuthenticationId = Token->AuthenticationId; + TokenControl->TokenId = Token->TokenId; + TokenControl->TokenSource = Token->TokenSource; - /* Add the additional groups array length */ - UserGroupsLength += ALIGN_UP_BY(GroupsLength, sizeof(PVOID)); + /* Lock the token */ + SepAcquireTokenLockShared(Token); - VariableLength = PrivilegesLength + UserGroupsLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; + /* Capture the modified ID */ + TokenControl->ModifiedId = Token->ModifiedId; - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - TotalSize, - 0, - 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObCreateObject() failed (Status 0x%lx)\n", Status); - return Status; - } + /* Unlock it */ + SepReleaseTokenLock(Token); +} - /* Zero out the buffer and initialize the token */ - RtlZeroMemory(AccessToken, TotalSize); +/** + * @brief + * Creates the system process token. + * + * @return + * Returns the system process token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +NTAPI +SepCreateSystemProcessToken(VOID) +{ + LUID_AND_ATTRIBUTES Privileges[25]; + ULONG GroupAttributes, OwnerAttributes; + SID_AND_ATTRIBUTES Groups[32]; + LARGE_INTEGER Expiration; + SID_AND_ATTRIBUTES UserSid; + ULONG GroupsLength; + PSID PrimaryGroup; + OBJECT_ATTRIBUTES ObjectAttributes; + PSID Owner; + ULONG i; + PTOKEN Token; + NTSTATUS Status; - AccessToken->TokenId = TokenId; - AccessToken->TokenType = TokenType; - AccessToken->ImpersonationLevel = ImpersonationLevel; + /* Don't ever expire */ + Expiration.QuadPart = -1; - /* Initialise the lock for the access token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - goto Quit; + /* All groups mandatory and enabled */ + GroupAttributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; + OwnerAttributes = SE_GROUP_ENABLED | SE_GROUP_OWNER | SE_GROUP_ENABLED_BY_DEFAULT; - AccessToken->TokenSource.SourceIdentifier = TokenSource->SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - TokenSource->SourceName, - sizeof(TokenSource->SourceName)); + /* User is Local System */ + UserSid.Sid = SeLocalSystemSid; + UserSid.Attributes = 0; - AccessToken->ExpirationTime = *ExpirationTime; - AccessToken->ModifiedId = ModifiedId; + /* Primary group is Local System */ + PrimaryGroup = SeLocalSystemSid; - AccessToken->TokenFlags = TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; + /* Owner is Administrators */ + Owner = SeAliasAdminsSid; - /* Copy and reference the logon session */ - AccessToken->AuthenticationId = *AuthenticationId; - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* No logon session could be found, bail out */ - DPRINT1("SepRmReferenceLogonSession() failed (Status 0x%lx)\n", Status); - /* Set the flag for proper cleanup by the delete procedure */ - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } + /* Groups are Administrators, World, and Authenticated Users */ + Groups[0].Sid = SeAliasAdminsSid; + Groups[0].Attributes = OwnerAttributes; + Groups[1].Sid = SeWorldSid; + Groups[1].Attributes = GroupAttributes; + Groups[2].Sid = SeAuthenticatedUsersSid; + Groups[2].Attributes = GroupAttributes; + GroupsLength = sizeof(SID_AND_ATTRIBUTES) + + SeLengthSid(Groups[0].Sid) + + SeLengthSid(Groups[1].Sid) + + SeLengthSid(Groups[2].Sid); + ASSERT(GroupsLength <= sizeof(Groups)); - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepRmInsertLogonSessionIntoToken() failed (Status 0x%lx)\n", Status); - goto Quit; - } + /* Setup the privileges */ + i = 0; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeTcbPrivilege; - /* Fill in token debug information */ -#if DBG - /* - * We must determine ourselves that the current - * process is not the initial CPU one. The initial - * process is not a "real" process, that is, the - * Process Manager has not yet been initialized and - * as a matter of fact we are creating a token before - * any process gets created by Ps. If it turns out - * that the current process is the initial CPU process - * where token creation execution takes place, don't - * do anything. - */ - if (PsGetCurrentProcess() != &KiInitialProcess) - { - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeCreateTokenPrivilege; - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeTakeOwnershipPrivilege; - AccessToken->CreateMethod = TOKEN_CREATE_METHOD; -#endif + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeCreatePagefilePrivilege; - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeLockMemoryPrivilege; - /* Copy the privileges */ - AccessToken->PrivilegeCount = PrivilegeCount; - AccessToken->Privileges = NULL; - if (PrivilegeCount > 0) - { - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeAssignPrimaryTokenPrivilege; - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - RtlCopyMemory(AccessToken->Privileges, - Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - else - { - RtlCopyMemory(AccessToken->Privileges, - Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeIncreaseQuotaPrivilege; - if (!NT_SUCCESS(Status)) - goto Quit; - } + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeIncreaseBasePriorityPrivilege; - /* Update the privilege flags */ - SepUpdatePrivilegeFlagsToken(AccessToken); - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 1 + GroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(1, - User, - VariableLength, - &AccessToken->UserAndGroups[0], - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - goto Quit; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeCreatePermanentPrivilege; - Status = RtlCopySidAndAttributesArray(GroupCount, - Groups, - VariableLength, - &AccessToken->UserAndGroups[1], - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - goto Quit; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeDebugPrivilege; - /* Find the token primary group and default owner */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - PrimaryGroup, - Owner, - &PrimaryGroupIndex, - &DefaultOwnerIndex); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepFindPrimaryGroupAndDefaultOwner failed (Status 0x%lx)\n", Status); - goto Quit; - } + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeAuditPrivilege; - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = DefaultOwnerIndex; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSecurityPrivilege; - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; - if (DefaultDacl != NULL) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSystemEnvironmentPrivilege; - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeChangeNotifyPrivilege; - RtlCopyMemory(AccessToken->DefaultDacl, - DefaultDacl, - DefaultDacl->AclSize); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeBackupPrivilege; - /* Insert the token only if it's not the system token, otherwise return it directly */ - if (!SystemToken) - { - Status = ObInsertObject(AccessToken, - NULL, - DesiredAccess, - 0, - NULL, - TokenHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObInsertObject() failed (Status 0x%lx)\n", Status); - } - } - else - { - /* Return pointer instead of handle */ - *TokenHandle = (HANDLE)AccessToken; - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeRestorePrivilege; -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the token, the delete procedure will clean it up */ - ObDereferenceObject(AccessToken); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeShutdownPrivilege; - return Status; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeLoadDriverPrivilege; + + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeProfileSingleProcessPrivilege; + + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSystemtimePrivilege; + ASSERT(i == 20); + + /* Setup the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemDefaultDacl != NULL); + + /* Create the token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, + 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeSystemAuthenticationId, + &Expiration, + &UserSid, + 3, + Groups, + GroupsLength, + 20, + Privileges, + Owner, + PrimaryGroup, + SeSystemDefaultDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + + /* Return the token */ + return Token; } /** * @brief - * Private helper function responsible for creating a restricted access - * token, that is, a filtered token from privileges and groups and with - * restricted SIDs added into the token on demand by the caller. - * - * @param[in] Token - * An existing and valid access token. - * - * @param[in] PrivilegesToBeDeleted - * A list of privileges to be deleted within the token that's going - * to be filtered. This parameter is ignored if the caller wants to disable - * all the privileges by specifying DISABLE_MAX_PRIVILEGE in the flags - * parameter. - * - * @param[in] SidsToBeDisabled - * A list of group SIDs to be disabled within the token. This parameter - * can be NULL. - * - * @param[in] RestrictedSidsIntoToken - * A list of restricted SIDs to be added into the token. This parameter - * can be NULL. - * - * @param[in] PrivilegesCount - * The privilege count of the privileges list. - * - * @param[in] RegularGroupsSidCount - * The SIDs count of the group SIDs list. - * - * @param[in] RestrictedSidsCount - * The restricted SIDs count of restricted SIDs list. - * - * @param[in] PrivilegeFlags - * Influences how the privileges should be filtered in an access - * token. See NtFilterToken syscall for more information. - * - * @param[in] PreviousMode - * Processor level access mode. - * - * @param[out] FilteredToken - * The filtered token, returned to the caller. + * Creates the anonymous logon token for the system. The difference between this + * token and the other one is the inclusion of everyone SID group (being SeWorldSid). + * The other token lacks such group. * * @return - * Returns STATUS_SUCCESS if token token filtering has completed successfully. - * STATUS_INVALID_PARAMETER is returned if one or more of the parameters - * do not meet the conditions imposed by the function. A failure NTSTATUS - * code is returned otherwise. - * - * @remarks - * The final outcome of privileges and/or SIDs filtering is not always - * deterministic. That is, any privileges or SIDs that aren't present - * in the access token are ignored and the function continues with the - * next privilege or SID to find for filtering. For a fully deterministic - * outcome the caller is responsible for querying the information details - * of privileges and SIDs present in the token and then afterwards use - * such obtained information to do any kind of filtering to the token. + * Returns the system's anonymous logon token if the operations have + * completed successfully. */ -static -NTSTATUS -SepPerformTokenFiltering( - _In_ PTOKEN Token, - _In_opt_ PLUID_AND_ATTRIBUTES PrivilegesToBeDeleted, - _In_opt_ PSID_AND_ATTRIBUTES SidsToBeDisabled, - _In_opt_ PSID_AND_ATTRIBUTES RestrictedSidsIntoToken, - _When_(PrivilegesToBeDeleted != NULL, _In_) ULONG PrivilegesCount, - _When_(SidsToBeDisabled != NULL, _In_) ULONG RegularGroupsSidCount, - _When_(RestrictedSidsIntoToken != NULL, _In_) ULONG RestrictedSidsCount, - _In_ ULONG PrivilegeFlags, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN *FilteredToken) +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID) { + SID_AND_ATTRIBUTES Groups[32], UserSid; + PSID PrimaryGroup; + PTOKEN Token; + ULONG GroupsLength; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - PTOKEN AccessToken; - PVOID EndMem; - ULONG RestrictedSidsLength; - ULONG PrivilegesLength; - ULONG PrimaryGroupIndex; - ULONG RestrictedSidsInList; - ULONG RestrictedSidsInToken; - ULONG VariableLength, TotalSize; - ULONG PrivsInToken, PrivsInList; - ULONG GroupsInToken, GroupsInList; - BOOLEAN WantPrivilegesDisabled; - BOOLEAN FoundPrivilege; - BOOLEAN FoundGroup; - - PAGED_CODE(); - - /* Ensure that the source token is valid, and lock it */ - ASSERT(Token); - SepAcquireTokenLockShared(Token); - /* Assume the caller doesn't want privileges disabled */ - WantPrivilegesDisabled = FALSE; + /* The token never expires */ + Expiration.QuadPart = -1; - /* Assume we haven't found anything */ - FoundPrivilege = FALSE; - FoundGroup = FALSE; + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; + UserSid.Attributes = 0; - /* - * Take the size that we need for filtered token - * allocation based upon the existing access token - * we've been given. - */ - VariableLength = Token->VariableLength; + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; - if (RestrictedSidsIntoToken != NULL) - { - /* - * If the caller provided a list of restricted SIDs - * to be added onto the filtered access token then - * we must compute the size which is the total space - * of the current token and the length of the restricted - * SIDs for the filtered token. - */ - RestrictedSidsLength = RestrictedSidsCount * sizeof(SID_AND_ATTRIBUTES); - RestrictedSidsLength += RtlLengthSidAndAttributes(RestrictedSidsCount, RestrictedSidsIntoToken); - RestrictedSidsLength = ALIGN_UP_BY(RestrictedSidsLength, sizeof(PVOID)); + /* The only group for the token is the World */ + Groups[0].Sid = SeWorldSid; + Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; + GroupsLength = sizeof(SID_AND_ATTRIBUTES) + + SeLengthSid(Groups[0].Sid); + ASSERT(GroupsLength <= sizeof(Groups)); - /* - * The variable length of the token is not just - * the actual space length of the existing token - * but also the sum of the restricted SIDs length. - */ - VariableLength += RestrictedSidsLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength + RestrictedSidsLength; - } - else - { - /* Otherwise the size is of the actual current token */ - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; - } + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); - /* Set up a filtered token object */ - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - NULL, - PreviousMode, - NULL, - TotalSize, + /* Create token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeAnonymousAuthenticationId, + &Expiration, + &UserSid, + 1, + Groups, + GroupsLength, 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to create the filtered token object (Status 0x%lx)\n", Status); - - /* Unlock the source token and bail out */ - SepReleaseTokenLock(Token); - return Status; - } - - /* Initialize the token and begin filling stuff to it */ - RtlZeroMemory(AccessToken, TotalSize); + NULL, + NULL, + PrimaryGroup, + SeSystemAnonymousLogonDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); - /* Set up a lock for the new token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - goto Quit; + /* Return the anonymous logon token */ + return Token; +} - /* Allocate new IDs for the token */ - ExAllocateLocallyUniqueId(&AccessToken->TokenId); - ExAllocateLocallyUniqueId(&AccessToken->ModifiedId); +/** + * @brief + * Creates the anonymous logon token for the system. This kind of token + * doesn't include the everyone SID group (being SeWorldSid). + * + * @return + * Returns the system's anonymous logon token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) +{ + SID_AND_ATTRIBUTES UserSid; + PSID PrimaryGroup; + PTOKEN Token; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; - /* Copy the type and impersonation level from the token */ - AccessToken->TokenType = Token->TokenType; - AccessToken->ImpersonationLevel = Token->ImpersonationLevel; + /* The token never expires */ + Expiration.QuadPart = -1; - /* Copy the immutable fields */ - AccessToken->TokenSource.SourceIdentifier = Token->TokenSource.SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); - - AccessToken->AuthenticationId = Token->AuthenticationId; - AccessToken->ParentTokenId = Token->TokenId; - AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - - AccessToken->ExpirationTime = Token->ExpirationTime; - - /* Copy the mutable fields */ - AccessToken->SessionId = Token->SessionId; - AccessToken->TokenFlags = Token->TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; - - /* Reference the logon session */ - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* We failed, bail out*/ - DPRINT1("SepPerformTokenFiltering(): Failed to reference the logon session (Status 0x%lx)\n", Status); - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } - - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepPerformTokenFiltering(): Failed to insert the logon session into token (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Fill in token debug information */ -#if DBG - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); - - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - AccessToken->CreateMethod = TOKEN_FILTER_METHOD; -#endif - - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; - - /* Copy the privileges from the existing token */ - AccessToken->PrivilegeCount = 0; - AccessToken->Privileges = NULL; - if (Token->Privileges && (Token->PrivilegeCount > 0)) - { - PrivilegesLength = Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - /* - * Ensure that the token can actually hold all - * the privileges from the existing token. - * Otherwise something's seriously wrong and - * we've to guard ourselves. - */ - ASSERT(VariableLength >= PrivilegesLength); - - AccessToken->PrivilegeCount = Token->PrivilegeCount; - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; - - RtlCopyMemory(AccessToken->Privileges, - Token->Privileges, - AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 0; - AccessToken->UserAndGroups = NULL; - if (Token->UserAndGroups && (Token->UserAndGroupCount > 0)) - { - AccessToken->UserAndGroupCount = Token->UserAndGroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - VariableLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to copy the groups into token (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* Copy the restricted SIDs */ - AccessToken->RestrictedSidCount = 0; - AccessToken->RestrictedSids = NULL; - if (Token->RestrictedSids && (Token->RestrictedSidCount > 0)) - { - AccessToken->RestrictedSidCount = Token->RestrictedSidCount; - AccessToken->RestrictedSids = EndMem; - EndMem = &AccessToken->RestrictedSids[AccessToken->RestrictedSidCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->RestrictedSids); - - Status = RtlCopySidAndAttributesArray(AccessToken->RestrictedSidCount, - Token->RestrictedSids, - VariableLength, - AccessToken->RestrictedSids, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to copy the restricted SIDs into token (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* - * Insert the restricted SIDs into the token on - * the request by the caller. - */ - if (RestrictedSidsIntoToken != NULL) - { - for (RestrictedSidsInList = 0; RestrictedSidsInList < RestrictedSidsCount; RestrictedSidsInList++) - { - /* Did the caller assign attributes to the restricted SIDs? */ - if (RestrictedSidsIntoToken[RestrictedSidsInList].Attributes != 0) - { - /* There mustn't be any attributes, bail out */ - DPRINT1("SepPerformTokenFiltering(): There mustn't be any attributes to restricted SIDs!\n"); - Status = STATUS_INVALID_PARAMETER; - goto Quit; - } - } - - /* - * Ensure that the token can hold the restricted SIDs - * (the variable length is calculated at the beginning - * of the routine call). - */ - ASSERT(VariableLength >= RestrictedSidsLength); - - /* - * Now let's begin inserting the restricted SIDs into the filtered - * access token from the list the caller gave us. - */ - AccessToken->RestrictedSidCount = RestrictedSidsCount; - AccessToken->RestrictedSids = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + RestrictedSidsLength); - VariableLength -= RestrictedSidsLength; - - RtlCopyMemory(AccessToken->RestrictedSids, - RestrictedSidsIntoToken, - AccessToken->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES)); - - /* - * As we've copied the restricted SIDs into - * the token, we must assign them the following - * combination of attributes SE_GROUP_ENABLED, - * SE_GROUP_ENABLED_BY_DEFAULT and SE_GROUP_MANDATORY. - * With such attributes we estabilish that restricting - * SIDs into the token are enabled for access checks. - */ - for (RestrictedSidsInToken = 0; RestrictedSidsInToken < AccessToken->RestrictedSidCount; RestrictedSidsInToken++) - { - AccessToken->RestrictedSids[RestrictedSidsInToken].Attributes |= (SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY); - } - - /* - * As we added restricted SIDs into the token, mark - * it as restricted. - */ - AccessToken->TokenFlags |= TOKEN_IS_RESTRICTED; - } - - /* Search for the primary group */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - Token->PrimaryGroup, - NULL, - &PrimaryGroupIndex, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed searching for the primary group (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Assign the primary group and default owner index now */ - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; - AccessToken->DynamicPart = NULL; - if (Token->DynamicPart && Token->DefaultDacl) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; - - RtlCopyMemory(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - - /* - * Now figure out what does the caller - * want with the privileges. - */ - if (PrivilegeFlags & DISABLE_MAX_PRIVILEGE) - { - /* - * The caller wants them disabled, cache this request - * for later operations. - */ - WantPrivilegesDisabled = TRUE; - } - - if (PrivilegeFlags & SANDBOX_INERT) - { - /* The caller wants an inert token, store the TOKEN_SANDBOX_INERT flag now */ - AccessToken->TokenFlags |= TOKEN_SANDBOX_INERT; - } - - /* - * Now it's time to filter the token's privileges. - * Loop all the privileges in the token. - */ - for (PrivsInToken = 0; PrivsInToken < AccessToken->PrivilegeCount; PrivsInToken++) - { - if (WantPrivilegesDisabled) - { - /* - * We got the acknowledgement that the caller wants - * to disable all the privileges so let's just do it. - * However, as per the general documentation is stated - * that only SE_CHANGE_NOTIFY_PRIVILEGE must be kept - * therefore in that case we must skip this privilege. - */ - if (AccessToken->Privileges[PrivsInToken].Luid.LowPart == SE_CHANGE_NOTIFY_PRIVILEGE) - { - continue; - } - else - { - /* - * The act of disabling privileges actually means - * "deleting" them from the access token entirely. - * First we must disable them so that we can update - * token flags accordingly. - */ - AccessToken->Privileges[PrivsInToken].Attributes &= ~SE_PRIVILEGE_ENABLED; - SepUpdateSinglePrivilegeFlagToken(AccessToken, PrivsInToken); - - /* Remove the privileges now */ - SepRemovePrivilegeToken(AccessToken, PrivsInToken); - PrivsInToken--; - } - } - else - { - if (PrivilegesToBeDeleted != NULL) - { - /* Loop the privileges we've got to delete */ - for (PrivsInList = 0; PrivsInList < PrivilegesCount; PrivsInList++) - { - /* Does this privilege exist in the token? */ - if (RtlEqualLuid(&AccessToken->Privileges[PrivsInToken].Luid, - &PrivilegesToBeDeleted[PrivsInList].Luid)) - { - /* Mark that we found it */ - FoundPrivilege = TRUE; - break; - } - } - - /* Did we find the privilege? */ - if (PrivsInList == PrivilegesCount) - { - /* We didn't, continue with next one */ - continue; - } - } - } - - /* - * If we have found the target privilege in the token - * based on the privileges list given by the caller - * then begin deleting it. - */ - if (FoundPrivilege) - { - /* Disable the privilege and update the flags */ - AccessToken->Privileges[PrivsInToken].Attributes &= ~SE_PRIVILEGE_ENABLED; - SepUpdateSinglePrivilegeFlagToken(AccessToken, PrivsInToken); - - /* Delete the privilege */ - SepRemovePrivilegeToken(AccessToken, PrivsInToken); - - /* - * Adjust the index and reset the FoundPrivilege indicator - * so that we can continue with the next privilege to delete. - */ - PrivsInToken--; - FoundPrivilege = FALSE; - continue; - } - } - - /* - * Loop the group SIDs that we want to disable as - * per on the request by the caller. - */ - if (SidsToBeDisabled != NULL) - { - for (GroupsInToken = 0; GroupsInToken < AccessToken->UserAndGroupCount; GroupsInToken++) - { - for (GroupsInList = 0; GroupsInList < RegularGroupsSidCount; GroupsInList++) - { - /* Does this group SID exist in the token? */ - if (RtlEqualSid(&AccessToken->UserAndGroups[GroupsInToken].Sid, - &SidsToBeDisabled[GroupsInList].Sid)) - { - /* Mark that we found it */ - FoundGroup = TRUE; - break; - } - } - - /* Did we find the group? */ - if (GroupsInList == RegularGroupsSidCount) - { - /* We didn't, continue with next one */ - continue; - } - - /* If we have found the group, disable it */ - if (FoundGroup) - { - /* - * If the acess token belongs to the administrators - * group and this is the target group, we must take - * away TOKEN_HAS_ADMIN_GROUP flag from the token. - */ - if (RtlEqualSid(SeAliasAdminsSid, - &AccessToken->UserAndGroups[GroupsInToken].Sid)) - { - AccessToken->TokenFlags &= ~TOKEN_HAS_ADMIN_GROUP; - } - - /* - * If the target group that we have found it is the - * owner then from now on it no longer is but the user. - * Therefore assign the default owner index as the user. - */ - if (AccessToken->DefaultOwnerIndex == GroupsInToken) - { - AccessToken->DefaultOwnerIndex = 0; - } - - /* - * The principle of disabling a group SID is by - * taking away SE_GROUP_ENABLED_BY_DEFAULT and - * SE_GROUP_ENABLED attributes and assign - * SE_GROUP_USE_FOR_DENY_ONLY. This renders - * SID a "Deny only" SID. - */ - AccessToken->UserAndGroups[GroupsInToken].Attributes &= ~(SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT); - AccessToken->UserAndGroups[GroupsInToken].Attributes |= SE_GROUP_USE_FOR_DENY_ONLY; - - /* Adjust the index and continue with the next group */ - GroupsInToken--; - FoundGroup = FALSE; - continue; - } - } - } - - /* We've finally filtered the token, return it to the caller */ - *FilteredToken = AccessToken; - Status = STATUS_SUCCESS; - DPRINT("SepPerformTokenFiltering(): The token has been filtered!\n"); - -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the created token */ - ObDereferenceObject(AccessToken); - } - - /* Unlock the source token */ - SepReleaseTokenLock(Token); - - return Status; -} - -/** - * @brief - * Creates the system process token. - * - * @return - * Returns the system process token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -NTAPI -SepCreateSystemProcessToken(VOID) -{ - LUID_AND_ATTRIBUTES Privileges[25]; - ULONG GroupAttributes, OwnerAttributes; - SID_AND_ATTRIBUTES Groups[32]; - LARGE_INTEGER Expiration; - SID_AND_ATTRIBUTES UserSid; - ULONG GroupsLength; - PSID PrimaryGroup; - OBJECT_ATTRIBUTES ObjectAttributes; - PSID Owner; - ULONG i; - PTOKEN Token; - NTSTATUS Status; - - /* Don't ever expire */ - Expiration.QuadPart = -1; - - /* All groups mandatory and enabled */ - GroupAttributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; - OwnerAttributes = SE_GROUP_ENABLED | SE_GROUP_OWNER | SE_GROUP_ENABLED_BY_DEFAULT; - - /* User is Local System */ - UserSid.Sid = SeLocalSystemSid; + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; UserSid.Attributes = 0; - /* Primary group is Local System */ - PrimaryGroup = SeLocalSystemSid; - - /* Owner is Administrators */ - Owner = SeAliasAdminsSid; - - /* Groups are Administrators, World, and Authenticated Users */ - Groups[0].Sid = SeAliasAdminsSid; - Groups[0].Attributes = OwnerAttributes; - Groups[1].Sid = SeWorldSid; - Groups[1].Attributes = GroupAttributes; - Groups[2].Sid = SeAuthenticatedUsersSid; - Groups[2].Attributes = GroupAttributes; - GroupsLength = sizeof(SID_AND_ATTRIBUTES) + - SeLengthSid(Groups[0].Sid) + - SeLengthSid(Groups[1].Sid) + - SeLengthSid(Groups[2].Sid); - ASSERT(GroupsLength <= sizeof(Groups)); - - /* Setup the privileges */ - i = 0; - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeTcbPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeCreateTokenPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeTakeOwnershipPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeCreatePagefilePrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeLockMemoryPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeAssignPrimaryTokenPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeIncreaseQuotaPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeIncreaseBasePriorityPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeCreatePermanentPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeDebugPrivilege; + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeAuditPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSecurityPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSystemEnvironmentPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeChangeNotifyPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeBackupPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeRestorePrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeShutdownPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeLoadDriverPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeProfileSingleProcessPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSystemtimePrivilege; - ASSERT(i == 20); - - /* Setup the object attributes */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemDefaultDacl != NULL); - - /* Create the token */ - Status = SepCreateToken((PHANDLE)&Token, - KernelMode, - 0, - &ObjectAttributes, - TokenPrimary, - SecurityAnonymous, - &SeSystemAuthenticationId, - &Expiration, - &UserSid, - 3, - Groups, - GroupsLength, - 20, - Privileges, - Owner, - PrimaryGroup, - SeSystemDefaultDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the token */ - return Token; -} - -/** - * @brief - * Creates the anonymous logon token for the system. The difference between this - * token and the other one is the inclusion of everyone SID group (being SeWorldSid). - * The other token lacks such group. - * - * @return - * Returns the system's anonymous logon token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonToken(VOID) -{ - SID_AND_ATTRIBUTES Groups[32], UserSid; - PSID PrimaryGroup; - PTOKEN Token; - ULONG GroupsLength; - LARGE_INTEGER Expiration; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - - /* The token never expires */ - Expiration.QuadPart = -1; - - /* The user is the anonymous logon */ - UserSid.Sid = SeAnonymousLogonSid; - UserSid.Attributes = 0; - - /* The primary group is also the anonymous logon */ - PrimaryGroup = SeAnonymousLogonSid; - - /* The only group for the token is the World */ - Groups[0].Sid = SeWorldSid; - Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; - GroupsLength = sizeof(SID_AND_ATTRIBUTES) + - SeLengthSid(Groups[0].Sid); - ASSERT(GroupsLength <= sizeof(Groups)); - - /* Initialise the object attributes for the token */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemAnonymousLogonDacl != NULL); - - /* Create token */ - Status = SepCreateToken((PHANDLE)&Token, - KernelMode, - 0, - &ObjectAttributes, - TokenPrimary, - SecurityAnonymous, - &SeAnonymousAuthenticationId, - &Expiration, - &UserSid, - 1, - Groups, - GroupsLength, - 0, - NULL, - NULL, - PrimaryGroup, - SeSystemAnonymousLogonDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the anonymous logon token */ - return Token; -} - -/** - * @brief - * Creates the anonymous logon token for the system. This kind of token - * doesn't include the everyone SID group (being SeWorldSid). - * - * @return - * Returns the system's anonymous logon token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) -{ - SID_AND_ATTRIBUTES UserSid; - PSID PrimaryGroup; - PTOKEN Token; - LARGE_INTEGER Expiration; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - - /* The token never expires */ - Expiration.QuadPart = -1; - - /* The user is the anonymous logon */ - UserSid.Sid = SeAnonymousLogonSid; - UserSid.Attributes = 0; - - /* The primary group is also the anonymous logon */ - PrimaryGroup = SeAnonymousLogonSid; - - /* Initialise the object attributes for the token */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemAnonymousLogonDacl != NULL); + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); /* Create token */ Status = SepCreateToken((PHANDLE)&Token, @@ -2852,3316 +1595,296 @@ SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) &UserSid, 0, NULL, - 0, - 0, - NULL, - NULL, - PrimaryGroup, - SeSystemAnonymousLogonDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the anonymous (not including everyone) logon token */ - return Token; -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -/** - * @brief - * Filters an access token from an existing token, making it more restricted - * than the previous one. - * - * @param[in] ExistingToken - * An existing token for filtering. - * - * @param[in] Flags - * Privilege flag options. This parameter argument influences how the token - * is filtered. Such parameter can be 0. See NtFilterToken syscall for - * more information. - * - * @param[in] SidsToDisable - * Array of SIDs to disable. Such parameter can be NULL. - * - * @param[in] PrivilegesToDelete - * Array of privileges to delete. If DISABLE_MAX_PRIVILEGE flag is specified - * in the Flags parameter, PrivilegesToDelete is ignored. - * - * @param[in] RestrictedSids - * An array of restricted SIDs for the new filtered token. Such parameter - * can be NULL. - * - * @param[out] FilteredToken - * The newly filtered token, returned to the caller. - * - * @return - * Returns STATUS_SUCCESS if the function has successfully completed its - * operations and that the access token has been filtered. STATUS_INVALID_PARAMETER - * is returned if one or more of the parameter are not valid. A failure NTSTATUS code - * is returned otherwise. - */ -NTSTATUS -NTAPI -SeFilterToken( - _In_ PACCESS_TOKEN ExistingToken, - _In_ ULONG Flags, - _In_opt_ PTOKEN_GROUPS SidsToDisable, - _In_opt_ PTOKEN_PRIVILEGES PrivilegesToDelete, - _In_opt_ PTOKEN_GROUPS RestrictedSids, - _Out_ PACCESS_TOKEN *FilteredToken) -{ - NTSTATUS Status; - PTOKEN AccessToken; - ULONG PrivilegesCount = 0; - ULONG SidsCount = 0; - ULONG RestrictedSidsCount = 0; - - PAGED_CODE(); - - /* Begin copying the counters */ - if (SidsToDisable != NULL) - { - SidsCount = SidsToDisable->GroupCount; - } - - if (PrivilegesToDelete != NULL) - { - PrivilegesCount = PrivilegesToDelete->PrivilegeCount; - } - - if (RestrictedSids != NULL) - { - RestrictedSidsCount = RestrictedSids->GroupCount; - } - - /* Call the internal API */ - Status = SepPerformTokenFiltering(ExistingToken, - PrivilegesToDelete->Privileges, - SidsToDisable->Groups, - RestrictedSids->Groups, - PrivilegesCount, - SidsCount, - RestrictedSidsCount, - Flags, - KernelMode, - &AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SeFilterToken(): Failed to filter the token (Status 0x%lx)\n", Status); - return Status; - } - - /* Insert the filtered token */ - Status = ObInsertObject(AccessToken, - NULL, - 0, - 0, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SeFilterToken(): Failed to insert the filtered token (Status 0x%lx)\n", Status); - return Status; - } - - /* Return it to the caller */ - *FilteredToken = AccessToken; - return Status; -} - -/** - * @brief - * Queries information details about the given token to the call. The difference - * between NtQueryInformationToken and this routine is that the system call has - * user mode buffer data probing and additional protection checks whereas this - * routine doesn't have any of these. The routine is used exclusively in kernel - * mode. - * - * @param[in] AccessToken - * An access token to be given. - * - * @param[in] TokenInformationClass - * Token information class. - * - * @param[out] TokenInformation - * Buffer with retrieved information. Such information is arbitrary, depending - * on the requested information class. - * - * @return - * Returns STATUS_SUCCESS if the operation to query the desired information - * has completed successfully. STATUS_INSUFFICIENT_RESOURCES is returned if - * pool memory allocation has failed to satisfy an operation. Otherwise - * STATUS_INVALID_INFO_CLASS is returned indicating that the information - * class provided is not supported by the routine. - * - * @remarks - * Only certain information classes are not implemented in this function and - * these are TokenOrigin, TokenGroupsAndPrivileges, TokenRestrictedSids and - * TokenSandBoxInert. The following classes are implemented in NtQueryInformationToken - * only. - */ -NTSTATUS -NTAPI -SeQueryInformationToken( - _In_ PACCESS_TOKEN AccessToken, - _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, - _Outptr_result_buffer_(_Inexpressible_(token-dependent)) PVOID *TokenInformation) -{ - NTSTATUS Status; - PTOKEN Token = (PTOKEN)AccessToken; - ULONG RequiredLength; - union - { - PSID PSid; - ULONG Ulong; - } Unused; - - PAGED_CODE(); - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - switch (TokenInformationClass) - { - case TokenUser: - { - PTOKEN_USER tu; - - DPRINT("SeQueryInformationToken(TokenUser)\n"); - RequiredLength = sizeof(TOKEN_USER) + - RtlLengthSid(Token->UserAndGroups[0].Sid); - - /* Allocate the output buffer */ - tu = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tu == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - Status = RtlCopySidAndAttributesArray(1, - &Token->UserAndGroups[0], - RequiredLength - sizeof(TOKEN_USER), - &tu->User, - (PSID)(tu + 1), - &Unused.PSid, - &Unused.Ulong); - - /* Return the structure */ - *TokenInformation = tu; - Status = STATUS_SUCCESS; - break; - } - - case TokenGroups: - { - PTOKEN_GROUPS tg; - ULONG SidLen; - PSID Sid; - - DPRINT("SeQueryInformationToken(TokenGroups)\n"); - RequiredLength = sizeof(tg->GroupCount) + - RtlLengthSidAndAttributes(Token->UserAndGroupCount - 1, &Token->UserAndGroups[1]); - - SidLen = RequiredLength - sizeof(tg->GroupCount) - - ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES)); - - /* Allocate the output buffer */ - tg = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tg == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - Sid = (PSID)((ULONG_PTR)tg + sizeof(tg->GroupCount) + - ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES))); - - tg->GroupCount = Token->UserAndGroupCount - 1; - Status = RtlCopySidAndAttributesArray(Token->UserAndGroupCount - 1, - &Token->UserAndGroups[1], - SidLen, - &tg->Groups[0], - Sid, - &Unused.PSid, - &Unused.Ulong); - - /* Return the structure */ - *TokenInformation = tg; - Status = STATUS_SUCCESS; - break; - } - - case TokenPrivileges: - { - PTOKEN_PRIVILEGES tp; - - DPRINT("SeQueryInformationToken(TokenPrivileges)\n"); - RequiredLength = sizeof(tp->PrivilegeCount) + - (Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - - /* Allocate the output buffer */ - tp = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tp == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - tp->PrivilegeCount = Token->PrivilegeCount; - RtlCopyLuidAndAttributesArray(Token->PrivilegeCount, - Token->Privileges, - &tp->Privileges[0]); - - /* Return the structure */ - *TokenInformation = tp; - Status = STATUS_SUCCESS; - break; - } - - case TokenOwner: - { - PTOKEN_OWNER to; - ULONG SidLen; - - DPRINT("SeQueryInformationToken(TokenOwner)\n"); - SidLen = RtlLengthSid(Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); - RequiredLength = sizeof(TOKEN_OWNER) + SidLen; - - /* Allocate the output buffer */ - to = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (to == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - to->Owner = (PSID)(to + 1); - Status = RtlCopySid(SidLen, - to->Owner, - Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); - - /* Return the structure */ - *TokenInformation = to; - Status = STATUS_SUCCESS; - break; - } - - case TokenPrimaryGroup: - { - PTOKEN_PRIMARY_GROUP tpg; - ULONG SidLen; - - DPRINT("SeQueryInformationToken(TokenPrimaryGroup)\n"); - SidLen = RtlLengthSid(Token->PrimaryGroup); - RequiredLength = sizeof(TOKEN_PRIMARY_GROUP) + SidLen; - - /* Allocate the output buffer */ - tpg = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tpg == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - tpg->PrimaryGroup = (PSID)(tpg + 1); - Status = RtlCopySid(SidLen, - tpg->PrimaryGroup, - Token->PrimaryGroup); - - /* Return the structure */ - *TokenInformation = tpg; - Status = STATUS_SUCCESS; - break; - } - - case TokenDefaultDacl: - { - PTOKEN_DEFAULT_DACL tdd; - - DPRINT("SeQueryInformationToken(TokenDefaultDacl)\n"); - RequiredLength = sizeof(TOKEN_DEFAULT_DACL); - - if (Token->DefaultDacl != NULL) - RequiredLength += Token->DefaultDacl->AclSize; - - /* Allocate the output buffer */ - tdd = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tdd == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - if (Token->DefaultDacl != NULL) - { - tdd->DefaultDacl = (PACL)(tdd + 1); - RtlCopyMemory(tdd->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - else - { - tdd->DefaultDacl = NULL; - } - - /* Return the structure */ - *TokenInformation = tdd; - Status = STATUS_SUCCESS; - break; - } - - case TokenSource: - { - PTOKEN_SOURCE ts; - - DPRINT("SeQueryInformationToken(TokenSource)\n"); - RequiredLength = sizeof(TOKEN_SOURCE); - - /* Allocate the output buffer */ - ts = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (ts == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *ts = Token->TokenSource; - - /* Return the structure */ - *TokenInformation = ts; - Status = STATUS_SUCCESS; - break; - } - - case TokenType: - { - PTOKEN_TYPE tt; - - DPRINT("SeQueryInformationToken(TokenType)\n"); - RequiredLength = sizeof(TOKEN_TYPE); - - /* Allocate the output buffer */ - tt = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tt == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *tt = Token->TokenType; - - /* Return the structure */ - *TokenInformation = tt; - Status = STATUS_SUCCESS; - break; - } - - case TokenImpersonationLevel: - { - PSECURITY_IMPERSONATION_LEVEL sil; - - DPRINT("SeQueryInformationToken(TokenImpersonationLevel)\n"); - RequiredLength = sizeof(SECURITY_IMPERSONATION_LEVEL); - - /* Fail if the token is not an impersonation token */ - if (Token->TokenType != TokenImpersonation) - { - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - /* Allocate the output buffer */ - sil = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (sil == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *sil = Token->ImpersonationLevel; - - /* Return the structure */ - *TokenInformation = sil; - Status = STATUS_SUCCESS; - break; - } - - case TokenStatistics: - { - PTOKEN_STATISTICS ts; - - DPRINT("SeQueryInformationToken(TokenStatistics)\n"); - RequiredLength = sizeof(TOKEN_STATISTICS); - - /* Allocate the output buffer */ - ts = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (ts == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - ts->TokenId = Token->TokenId; - ts->AuthenticationId = Token->AuthenticationId; - ts->ExpirationTime = Token->ExpirationTime; - ts->TokenType = Token->TokenType; - ts->ImpersonationLevel = Token->ImpersonationLevel; - ts->DynamicCharged = Token->DynamicCharged; - ts->DynamicAvailable = Token->DynamicAvailable; - ts->GroupCount = Token->UserAndGroupCount - 1; - ts->PrivilegeCount = Token->PrivilegeCount; - ts->ModifiedId = Token->ModifiedId; - - /* Return the structure */ - *TokenInformation = ts; - Status = STATUS_SUCCESS; - break; - } - - case TokenSessionId: - { - DPRINT("SeQueryInformationToken(TokenSessionId)\n"); - Status = SeQuerySessionIdToken(Token, (PULONG)TokenInformation); - break; - } - - default: - DPRINT1("SeQueryInformationToken(%d) invalid information class\n", TokenInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - /* Release the lock of the token */ - SepReleaseTokenLock(Token); - - return Status; -} - -/** - * @brief - * Queries the session ID of an access token. - * - * @param[in] Token - * A valid access token where the session ID has to be gathered. - * - * @param[out] pSessionId - * The returned pointer to a session ID to the caller. - * - * @return - * Returns STATUS_SUCCESS. - */ -NTSTATUS -NTAPI -SeQuerySessionIdToken( - _In_ PACCESS_TOKEN Token, - _Out_ PULONG pSessionId) -{ - PAGED_CODE(); - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - *pSessionId = ((PTOKEN)Token)->SessionId; - - /* Unlock the token */ - SepReleaseTokenLock(Token); - - return STATUS_SUCCESS; -} - -/** - * @brief - * Queries the authentication ID of an access token. - * - * @param[in] Token - * A valid access token where the authentication ID has to be gathered. - * - * @param[out] pSessionId - * The returned pointer to an authentication ID to the caller. - * - * @return - * Returns STATUS_SUCCESS. - */ -NTSTATUS -NTAPI -SeQueryAuthenticationIdToken( - _In_ PACCESS_TOKEN Token, - _Out_ PLUID LogonId) -{ - PAGED_CODE(); - - *LogonId = ((PTOKEN)Token)->AuthenticationId; - - return STATUS_SUCCESS; -} - -/** - * @brief - * Gathers the security impersonation level of an access token. - * - * @param[in] Token - * A valid access token where the impersonation level has to be gathered. - * - * @return ... 7988 lines suppressed ...

2 years, 6 months

[reactos] 01/01: [GITHUB] Add workflow to close stale PR's

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96eacfc352adb9d37ab23… commit 96eacfc352adb9d37ab2324a62518106eeb2bddc Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun May 15 17:59:37 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 29 20:10:31 2022 +0200 [GITHUB] Add workflow to close stale PR's --- .github/workflows/stale.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000000..a243274f9f8 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,32 @@ +# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time. +# +# You can adjust the behavior by modifying this file. +# For more information, see: +# https://github.com/actions/stale +name: Mark stale issues and pull requests + +on: + schedule: + - cron: '43 0 * * *' + +jobs: + stale: + + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + + steps: + - uses: actions/stale@v5 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 120 + days-before-issue-stale: -1 + days-before-close: 14 + days-before-issue-close: -1 + exempt-all-assignees: true + stale-pr-message: 'This PR is stale because it received no updates in the last 4 months. Without removing the stale label, or commenting on this ticket it will be closed in 2 weeks.' + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + operations-per-run: 50

2 years, 6 months

[reactos] 01/01: [DISKPART] Improve DETAIL commands

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54efd758891980351e737… commit 54efd758891980351e73738a21432f7c9b01b223 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 17:32:34 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 17:32:34 2022 +0200 [DISKPART] Improve DETAIL commands --- base/system/diskpart/detail.c | 152 ++++++++++++++++++++++++++++++++-- base/system/diskpart/diskpart.h | 8 ++ base/system/diskpart/list.c | 178 ++++++++++++++++++++++------------------ 3 files changed, 249 insertions(+), 89 deletions(-) diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c index 0c0de3e262a..388cb8a45af 100644 --- a/base/system/diskpart/detail.c +++ b/base/system/diskpart/detail.c @@ -13,11 +13,66 @@ /* FUNCTIONS ******************************************************************/ +static +BOOL +IsDiskInVolume( + _In_ PVOLENTRY VolumeEntry, + _In_ PDISKENTRY DiskEntry) +{ + ULONG i; + + if ((VolumeEntry == NULL) || + (VolumeEntry->pExtents == NULL) || + (DiskEntry == NULL)) + return FALSE; + + for (i = 0; i < VolumeEntry->pExtents->NumberOfDiskExtents; i++) + { + if (VolumeEntry->pExtents->Extents[i].DiskNumber == DiskEntry->DiskNumber) + return TRUE; + } + + return FALSE; +} + + +static +BOOL +IsPartitionInVolume( + _In_ PVOLENTRY VolumeEntry, + _In_ PPARTENTRY PartEntry) +{ + ULONG i; + + if ((VolumeEntry == NULL) || + (VolumeEntry->pExtents == NULL) || + (PartEntry == NULL) || + (PartEntry->DiskEntry == NULL)) + return FALSE; + + for (i = 0; i < VolumeEntry->pExtents->NumberOfDiskExtents; i++) + { + if (VolumeEntry->pExtents->Extents[i].DiskNumber == PartEntry->DiskEntry->DiskNumber) + { + if ((VolumeEntry->pExtents->Extents[i].StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * PartEntry->DiskEntry->BytesPerSector) && + (VolumeEntry->pExtents->Extents[i].ExtentLength.QuadPart == PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector)) + return TRUE; + } + } + + return FALSE; +} + + BOOL DetailDisk( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + BOOL bPrintHeader = TRUE; + DPRINT("DetailDisk()\n"); if (argc > 2) @@ -38,6 +93,28 @@ DetailDisk( ConResPrintf(StdOut, IDS_DETAIL_INFO_PATH, CurrentDisk->PathId); ConResPrintf(StdOut, IDS_DETAIL_INFO_TARGET, CurrentDisk->TargetId); ConResPrintf(StdOut, IDS_DETAIL_INFO_LUN_ID, CurrentDisk->Lun); + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (IsDiskInVolume(VolumeEntry, CurrentDisk)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); + ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); + bPrintHeader = FALSE; + } + + PrintVolume(VolumeEntry); + } + + Entry = Entry->Flink; + } + ConPuts(StdOut, L"\n"); return TRUE; @@ -46,11 +123,14 @@ DetailDisk( BOOL DetailPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { PPARTENTRY PartEntry; ULONGLONG PartOffset; + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + BOOL bVolumeFound = FALSE, bPrintHeader = TRUE; DPRINT("DetailPartition()\n"); @@ -82,6 +162,32 @@ DetailPartition( ConResPrintf(StdOut, IDS_DETAIL_PARTITION_HIDDEN, ""); ConResPrintf(StdOut, IDS_DETAIL_PARTITION_ACTIVE, PartEntry->BootIndicator ? L"Yes" : L"No"); ConResPrintf(StdOut, IDS_DETAIL_PARTITION_OFFSET, PartOffset); + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (IsPartitionInVolume(VolumeEntry, CurrentPartition)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); + ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); + bPrintHeader = FALSE; + } + + PrintVolume(VolumeEntry); + bVolumeFound = TRUE; + } + + Entry = Entry->Flink; + } + + if (bVolumeFound == FALSE) + ConPuts(StdOut, L"\nThere is no volume associated with this partition.\n"); + ConPuts(StdOut, L"\n"); return TRUE; @@ -90,9 +196,13 @@ DetailPartition( BOOL DetailVolume( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + BOOL bDiskFound = FALSE, bPrintHeader = TRUE; + DPRINT("DetailVolume()\n"); if (argc > 2) @@ -107,7 +217,35 @@ DetailVolume( return TRUE; } - /* TODO: Print volume details */ + + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + if (IsDiskInVolume(CurrentVolume, DiskEntry)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_DISK_HEAD); + ConResPuts(StdOut, IDS_LIST_DISK_LINE); + bPrintHeader = FALSE; + } + + PrintDisk(DiskEntry); + bDiskFound = TRUE; + } + + Entry = Entry->Flink; + } + + if (bDiskFound == FALSE) + ConPuts(StdOut, L"\nThere are no disks attached to this volume.\n"); + + /* TODO: Print more volume details */ + + ConPuts(StdOut, L"\n"); return TRUE; } diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 23ea593e7b4..c4a4c2fad9e 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -361,6 +361,14 @@ ListVirtualDisk( INT argc, PWSTR *argv); +VOID +PrintDisk( + _In_ PDISKENTRY DiskEntry); + +VOID +PrintVolume( + _In_ PVOLENTRY VolumeEntry); + /* merge.c */ BOOL merge_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 21589c727cf..6591a7f14f1 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -13,6 +13,48 @@ /* FUNCTIONS ******************************************************************/ +VOID +PrintDisk( + _In_ PDISKENTRY DiskEntry) +{ + ULONGLONG DiskSize; + ULONGLONG FreeSize; + LPWSTR lpSizeUnit; + LPWSTR lpFreeUnit; + + DiskSize = DiskEntry->SectorCount.QuadPart * + (ULONGLONG)DiskEntry->BytesPerSector; + + if (DiskSize >= 10737418240) /* 10 GB */ + { + DiskSize = RoundingDivide(DiskSize, 1073741824); + lpSizeUnit = L"GB"; + } + else + { + DiskSize = RoundingDivide(DiskSize, 1048576); + if (DiskSize == 0) + DiskSize = 1; + lpSizeUnit = L"MB"; + } + + /* FIXME */ + FreeSize = 0; + lpFreeUnit = L"B"; + + ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, + (CurrentDisk == DiskEntry) ? L'*' : L' ', + DiskEntry->DiskNumber, + L"Online", + DiskSize, + lpSizeUnit, + FreeSize, + lpFreeUnit, + L" ", + L" "); +} + + BOOL ListDisk( INT argc, @@ -20,10 +62,6 @@ ListDisk( { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - ULONGLONG DiskSize; - ULONGLONG FreeSize; - LPWSTR lpSizeUnit; - LPWSTR lpFreeUnit; /* Header labels */ ConPuts(StdOut, L"\n"); @@ -35,36 +73,7 @@ ListDisk( { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - DiskSize = DiskEntry->SectorCount.QuadPart * - (ULONGLONG)DiskEntry->BytesPerSector; - - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = RoundingDivide(DiskSize, 1073741824); - lpSizeUnit = L"GB"; - } - else - { - DiskSize = RoundingDivide(DiskSize, 1048576); - if (DiskSize == 0) - DiskSize = 1; - lpSizeUnit = L"MB"; - } - - /* FIXME */ - FreeSize = 0; - lpFreeUnit = L"B"; - - ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, - (CurrentDisk == DiskEntry) ? L'*' : L' ', - DiskEntry->DiskNumber, - L"Online", - DiskSize, - lpSizeUnit, - FreeSize, - lpFreeUnit, - L" ", - L" "); + PrintDisk(DiskEntry); Entry = Entry->Flink; } @@ -217,6 +226,58 @@ ListPartition( } +VOID +PrintVolume( + _In_ PVOLENTRY VolumeEntry) +{ + ULONGLONG VolumeSize; + PWSTR pszSizeUnit; + PWSTR pszVolumeType; + + VolumeSize = VolumeEntry->Size.QuadPart; + if (VolumeSize >= 10737418240) /* 10 GB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1073741824); + pszSizeUnit = L"GB"; + } + else if (VolumeSize >= 10485760) /* 10 MB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1048576); + pszSizeUnit = L"MB"; + } + else + { + VolumeSize = RoundingDivide(VolumeSize, 1024); + pszSizeUnit = L"KB"; + } + switch (VolumeEntry->VolumeType) + { + case VOLUME_TYPE_CDROM: + pszVolumeType = L"DVD"; + break; + case VOLUME_TYPE_PARTITION: + pszVolumeType = L"Partition"; + break; + case VOLUME_TYPE_REMOVABLE: + pszVolumeType = L"Removable"; + break; + case VOLUME_TYPE_UNKNOWN: + default: + pszVolumeType = L"Unknown"; + break; + } + + ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, + (CurrentVolume == VolumeEntry) ? L'*' : L' ', + VolumeEntry->VolumeNumber, + VolumeEntry->DriveLetter, + (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", + (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", + pszVolumeType, + VolumeSize, pszSizeUnit); +} + + BOOL ListVolume( INT argc, @@ -224,9 +285,6 @@ ListVolume( { PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; - ULONGLONG VolumeSize; - PWSTR pszSizeUnit; - PWSTR pszVolumeType; ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); @@ -237,51 +295,7 @@ ListVolume( { VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); - VolumeSize = VolumeEntry->Size.QuadPart; - if (VolumeSize >= 10737418240) /* 10 GB */ - { - VolumeSize = RoundingDivide(VolumeSize, 1073741824); - pszSizeUnit = L"GB"; - } - else if (VolumeSize >= 10485760) /* 10 MB */ - { - VolumeSize = RoundingDivide(VolumeSize, 1048576); - pszSizeUnit = L"MB"; - } - else - { - VolumeSize = RoundingDivide(VolumeSize, 1024); - pszSizeUnit = L"KB"; - } - - switch (VolumeEntry->VolumeType) - { - case VOLUME_TYPE_CDROM: - pszVolumeType = L"DVD"; - break; - - case VOLUME_TYPE_PARTITION: - pszVolumeType = L"Partition"; - break; - - case VOLUME_TYPE_REMOVABLE: - pszVolumeType = L"Removable"; - break; - - case VOLUME_TYPE_UNKNOWN: - default: - pszVolumeType = L"Unknown"; - break; - } - - ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, - (CurrentVolume == VolumeEntry) ? L'*' : L' ', - VolumeEntry->VolumeNumber, - VolumeEntry->DriveLetter, - (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", - (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", - pszVolumeType, - VolumeSize, pszSizeUnit); + PrintVolume(VolumeEntry); Entry = Entry->Flink; }

2 years, 7 months

[reactos] 01/01: [NTOS:MM] Fix MiInsertSharedUserPageVad preventing boot on x64

by Tuur Martens

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc99b9d96e22934723b67… commit cc99b9d96e22934723b67f5ad4c8d3bcc60aeeff Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Mon May 23 21:08:17 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 29 13:28:27 2022 +0200 [NTOS:MM] Fix MiInsertSharedUserPageVad preventing boot on x64 Fix MiInsertSharedUserPageVad to not charge the system process pool quota. Even though PsChargeProcessNonPagedPoolQuota itself checks if the process specified is the system process, this doesn't work here as we're too early into boot for the kernel to know what the system process is. --- ntoskrnl/mm/ARM3/procsup.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 2ddd91c5ca2..4111d711e3c 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -901,12 +901,15 @@ MiInsertSharedUserPageVad( return Status; } - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) + if (Process->QuotaBlock != NULL) { - DPRINT1("Ran out of quota.\n"); - ExFreePoolWithTag(Vad, 'ldaV'); - return Status; + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of quota.\n"); + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } }

2 years, 7 months

[reactos] 01/01: [DISKPART] Silence a debug message

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96d137a559c985f576b05… commit 96d137a559c985f576b05e4942f1ce9d35dc5474 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 13:07:53 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 13:07:53 2022 +0200 [DISKPART] Silence a debug message --- base/system/diskpart/partlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 038557a4133..8d27b585ecc 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -1315,8 +1315,7 @@ AddVolumeToList( IO_STATUS_BLOCK Iosb; NTSTATUS Status; - - ConPrintf(StdOut, L"AddVolumeToList(%s)\n", pszVolumeName); + DPRINT("AddVolumeToList(%S)\n", pszVolumeName); VolumeEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,

2 years, 7 months

[reactos] 01/01: [DISKPART] Improve the LIST VOLUME command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a1c00c1178b79f550aed… commit 5a1c00c1178b79f550aed0430c8e26f4892032fa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 12:41:42 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 12:41:42 2022 +0200 [DISKPART] Improve the LIST VOLUME command --- base/system/diskpart/diskpart.h | 12 ++- base/system/diskpart/lang/en-US.rc | 6 +- base/system/diskpart/lang/pl-PL.rc | 6 +- base/system/diskpart/lang/pt-PT.rc | 6 +- base/system/diskpart/lang/ro-RO.rc | 6 +- base/system/diskpart/lang/ru-RU.rc | 6 +- base/system/diskpart/lang/sq-AL.rc | 6 +- base/system/diskpart/lang/tr-TR.rc | 6 +- base/system/diskpart/lang/zh-CN.rc | 6 +- base/system/diskpart/lang/zh-TW.rc | 6 +- base/system/diskpart/list.c | 45 ++++++-- base/system/diskpart/partlist.c | 211 ++++++++++++++++++++++++++++++++----- 12 files changed, 258 insertions(+), 64 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 218b6030a17..23ea593e7b4 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -83,6 +83,14 @@ typedef enum _FORMATSTATE Formatted } FORMATSTATE, *PFORMATSTATE; +typedef enum _VOLUME_TYPE +{ + VOLUME_TYPE_CDROM, + VOLUME_TYPE_PARTITION, + VOLUME_TYPE_REMOVABLE, + VOLUME_TYPE_UNKNOWN +} VOLUME_TYPE, *PVOLUME_TYPE; + typedef struct _PARTENTRY { LIST_ENTRY ListEntry; @@ -185,9 +193,11 @@ typedef struct _VOLENTRY PWSTR pszLabel; PWSTR pszFilesystem; - UINT DriveType; + VOLUME_TYPE VolumeType; ULARGE_INTEGER Size; + PVOLUME_DISK_EXTENTS pExtents; + } VOLENTRY, *PVOLENTRY; diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 7289cb2d159..4eeadf4066a 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -47,16 +47,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END /* RESCAN command string */ diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 426c948519d..69de3471d20 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -47,16 +47,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\nDysk ### Stan Rozmiar Wolne Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Dysk ### Stan Rozmiar Wolne Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\nPartycja Typ Rozmiar Przesunięcie\n" + IDS_LIST_PARTITION_HEAD " Partycja Typ Rozmiar Przesunięcie\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- ------------\n" IDS_LIST_PARTITION_FORMAT "%c Partycja %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n" IDS_LIST_VOLUME_HEAD " Wolumin ### Lit Etykieta FS Typ Rozmiar Stan Info\n" IDS_LIST_VOLUME_LINE " ----------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Wolumin %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Wolumin %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END /* RESCAN command string */ diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 86ec0a9c6e1..0edee6239c9 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disco ## Estado Tamanho Livre Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disco ## Estado Tamanho Livre Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- --------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partição Tipo Tamanho deslocamento\n" + IDS_LIST_PARTITION_HEAD " Partição Tipo Tamanho deslocamento\n" IDS_LIST_PARTITION_LINE " ------------- ------- --------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partição %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index add736038ea..7f69919ca93 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disc ### Stare Dimensiune Liber Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disc ### Stare Dimensiune Liber Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partiție Tip Dim. Depl.\n" + IDS_LIST_PARTITION_HEAD " Partiție Tip Dim. Depl.\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partiție %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 41867204039..3ecfe9122bf 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Диск ### Состояние Размер Свободно Дин GPT\n" + IDS_LIST_DISK_HEAD " Диск ### Состояние Размер Свободно Дин GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Разметка Тип Размер Отступ\n" + IDS_LIST_PARTITION_HEAD " Разметка Тип Размер Отступ\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 1f75c1588bf..49e7ea9ff34 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -46,16 +46,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 1daaf0e90e4..bb106bccd82 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -44,16 +44,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n Disk ### Durum Boyut Boş Dev Gpt\n" + IDS_LIST_DISK_HEAD " Disk ### Durum Boyut Boş Dev Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Bölüm Tür Boyut Ofset\n" + IDS_LIST_PARTITION_HEAD " Bölüm Tür Boyut Ofset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index e698bc05167..1a23e12d8cd 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -51,16 +51,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n 磁盘 ### 状态大小可用活动 Gpt\n" + IDS_LIST_DISK_HEAD " 磁盘 ### 状态大小可用活动 Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n 分区类型大小偏移量\n" + IDS_LIST_PARTITION_HEAD " 分区类型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 87dad569f01..6f931d2e0dd 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -45,16 +45,16 @@ END /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "\n 磁碟 ### 狀態大小可用 Dyn Gpt\n" + IDS_LIST_DISK_HEAD " 磁碟 ### 狀態大小可用 Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n 分區類型大小偏移量\n" + IDS_LIST_PARTITION_HEAD " 分區類型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" - IDS_LIST_VOLUME_FORMAT " Volume %-3lu %c %-11.11s %-5s %10u %4I64u %-2s\n" + IDS_LIST_VOLUME_FORMAT "%c Volume %-3lu %c %-11.11s %-5s %-10.10s %4I64u %-2s\n" END STRINGTABLE diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 4eb1d8fb823..21589c727cf 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -26,6 +26,7 @@ ListDisk( LPWSTR lpFreeUnit; /* Header labels */ + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_DISK_HEAD); ConResPuts(StdOut, IDS_LIST_DISK_LINE); @@ -55,7 +56,7 @@ ListDisk( lpFreeUnit = L"B"; ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, - (CurrentDisk == DiskEntry) ? L'*': ' ', + (CurrentDisk == DiskEntry) ? L'*' : L' ', DiskEntry->DiskNumber, L"Online", DiskSize, @@ -94,6 +95,7 @@ ListPartition( } /* Header labels */ + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_PARTITION_HEAD); ConResPuts(StdOut, IDS_LIST_PARTITION_LINE); @@ -141,7 +143,7 @@ ListPartition( } ConResPrintf(StdOut, IDS_LIST_PARTITION_FORMAT, - (CurrentPartition == PartEntry) ? L'*': ' ', + (CurrentPartition == PartEntry) ? L'*' : L' ', PartNumber++, IsContainerPartition(PartEntry->PartitionType) ? L"Extended" : L"Primary", PartSize, @@ -197,7 +199,7 @@ ListPartition( } ConResPrintf(StdOut, IDS_LIST_PARTITION_FORMAT, - (CurrentPartition == PartEntry) ? L'*': ' ', + (CurrentPartition == PartEntry) ? L'*' : L' ', PartNumber++, L"Logical", PartSize, @@ -223,8 +225,10 @@ ListVolume( PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; ULONGLONG VolumeSize; - LPWSTR lpSizeUnit; + PWSTR pszSizeUnit; + PWSTR pszVolumeType; + ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); @@ -237,31 +241,52 @@ ListVolume( if (VolumeSize >= 10737418240) /* 10 GB */ { VolumeSize = RoundingDivide(VolumeSize, 1073741824); - lpSizeUnit = L"GB"; + pszSizeUnit = L"GB"; } else if (VolumeSize >= 10485760) /* 10 MB */ { VolumeSize = RoundingDivide(VolumeSize, 1048576); - lpSizeUnit = L"MB"; + pszSizeUnit = L"MB"; } else { VolumeSize = RoundingDivide(VolumeSize, 1024); - lpSizeUnit = L"KB"; + pszSizeUnit = L"KB"; + } + + switch (VolumeEntry->VolumeType) + { + case VOLUME_TYPE_CDROM: + pszVolumeType = L"DVD"; + break; + + case VOLUME_TYPE_PARTITION: + pszVolumeType = L"Partition"; + break; + + case VOLUME_TYPE_REMOVABLE: + pszVolumeType = L"Removable"; + break; + + case VOLUME_TYPE_UNKNOWN: + default: + pszVolumeType = L"Unknown"; + break; } ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, + (CurrentVolume == VolumeEntry) ? L'*' : L' ', VolumeEntry->VolumeNumber, VolumeEntry->DriveLetter, (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", - VolumeEntry->DriveType, - VolumeSize, lpSizeUnit); + pszVolumeType, + VolumeSize, pszSizeUnit); Entry = Entry->Flink; } - ConPuts(StdOut, L"\n\n"); + ConPuts(StdOut, L"\n"); return TRUE; } diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 568f902ea38..038557a4133 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -1186,6 +1186,112 @@ DestroyPartitionList(VOID) } +static +VOID +GetVolumeExtents( + _In_ HANDLE VolumeHandle, + _In_ PVOLENTRY VolumeEntry) +{ + DWORD dwBytesReturned = 0, dwLength, i; + PVOLUME_DISK_EXTENTS pExtents; + BOOL bResult; + DWORD dwError; + + dwLength = sizeof(VOLUME_DISK_EXTENTS); + pExtents = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (pExtents == NULL) + return; + + bResult = DeviceIoControl(VolumeHandle, + IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, + NULL, + 0, + pExtents, + dwLength, + &dwBytesReturned, + NULL); + if (!bResult) + { + dwError = GetLastError(); + + if (dwError != ERROR_MORE_DATA) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + return; + } + else + { + dwLength = sizeof(VOLUME_DISK_EXTENTS) + ((pExtents->NumberOfDiskExtents - 1) * sizeof(DISK_EXTENT)); + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + pExtents = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (pExtents == NULL) + { + return; + } + + bResult = DeviceIoControl(VolumeHandle, + IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, + NULL, + 0, + pExtents, + dwLength, + &dwBytesReturned, + NULL); + if (!bResult) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pExtents); + return; + } + } + } + + for (i = 0; i < pExtents->NumberOfDiskExtents; i++) + VolumeEntry->Size.QuadPart += pExtents->Extents[i].ExtentLength.QuadPart; + + VolumeEntry->pExtents = pExtents; +} + + +static +VOID +GetVolumeType( + HANDLE VolumeHandle, + _In_ PVOLENTRY VolumeEntry) +{ + FILE_FS_DEVICE_INFORMATION DeviceInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &DeviceInfo, + sizeof(FILE_FS_DEVICE_INFORMATION), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + return; + + switch (DeviceInfo.DeviceType) + { + case FILE_DEVICE_CD_ROM: + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + VolumeEntry->VolumeType = VOLUME_TYPE_CDROM; + break; + + case FILE_DEVICE_DISK: + case FILE_DEVICE_DISK_FILE_SYSTEM: + if (DeviceInfo.Characteristics & FILE_REMOVABLE_MEDIA) + VolumeEntry->VolumeType = VOLUME_TYPE_REMOVABLE; + else + VolumeEntry->VolumeType = VOLUME_TYPE_PARTITION; + break; + + default: + VolumeEntry->VolumeType = VOLUME_TYPE_UNKNOWN; + break; + } +} + + static VOID AddVolumeToList( @@ -1193,30 +1299,72 @@ AddVolumeToList( PWSTR pszVolumeName) { PVOLENTRY VolumeEntry; + HANDLE VolumeHandle; - WCHAR szPathNames[256]; - DWORD dwLength; + DWORD dwError, dwLength; + WCHAR szPathNames[MAX_PATH + 1]; WCHAR szVolumeName[MAX_PATH + 1]; WCHAR szFilesystem[MAX_PATH + 1]; + DWORD CharCount = 0; + WCHAR DeviceName[MAX_PATH] = L""; + size_t Index = 0; + + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + + ConPrintf(StdOut, L"AddVolumeToList(%s)\n", pszVolumeName); VolumeEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VOLENTRY)); if (VolumeEntry == NULL) + return; + + VolumeEntry->VolumeNumber = ulVolumeNumber; + wcscpy(VolumeEntry->VolumeName, pszVolumeName); + + Index = wcslen(pszVolumeName) - 1; + + pszVolumeName[Index] = L'\0'; + + CharCount = QueryDosDeviceW(&pszVolumeName[4], DeviceName, ARRAYSIZE(DeviceName)); + + pszVolumeName[Index] = L'\\'; + + if (CharCount == 0) { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry); return; } + DPRINT("DeviceName: %S\n", DeviceName); - if (GetVolumePathNamesForVolumeNameW(pszVolumeName, - szPathNames, - 256, - &dwLength)) + RtlInitUnicodeString(&Name, DeviceName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&VolumeHandle, + SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + 0, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT); + if (NT_SUCCESS(Status)) { - VolumeEntry->DriveLetter = szPathNames[0]; + GetVolumeType(VolumeHandle, VolumeEntry); + GetVolumeExtents(VolumeHandle, VolumeEntry); + NtClose(VolumeHandle); + } - if (GetVolumeInformationW(szPathNames, + if (GetVolumeInformationW(pszVolumeName, szVolumeName, MAX_PATH + 1, NULL, // [out, optional] LPDWORD lpVolumeSerialNumber, @@ -1224,31 +1372,39 @@ AddVolumeToList( NULL, // [out, optional] LPDWORD lpFileSystemFlags, szFilesystem, MAX_PATH + 1)) - { - VolumeEntry->pszLabel = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - (wcslen(szVolumeName) + 1) * sizeof(WCHAR)); - if (VolumeEntry->pszLabel) - wcscpy(VolumeEntry->pszLabel, szVolumeName); + { + VolumeEntry->pszLabel = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(szVolumeName) + 1) * sizeof(WCHAR)); + if (VolumeEntry->pszLabel) + wcscpy(VolumeEntry->pszLabel, szVolumeName); + VolumeEntry->pszFilesystem = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(szFilesystem) + 1) * sizeof(WCHAR)); + if (VolumeEntry->pszFilesystem) + wcscpy(VolumeEntry->pszFilesystem, szFilesystem); + } + else + { + dwError = GetLastError(); + if (dwError == ERROR_UNRECOGNIZED_VOLUME) + { VolumeEntry->pszFilesystem = RtlAllocateHeap(RtlGetProcessHeap(), 0, - (wcslen(szFilesystem) + 1) * sizeof(WCHAR)); + (3 + 1) * sizeof(WCHAR)); if (VolumeEntry->pszFilesystem) - wcscpy(VolumeEntry->pszFilesystem, szFilesystem); - - VolumeEntry->DriveType = GetDriveType(szPathNames); - - GetDiskFreeSpaceExW(szPathNames, - NULL, // [out, optional] PULARGE_INTEGER lpFreeBytesAvailableToCaller, - &VolumeEntry->Size, // [out, optional] PULARGE_INTEGER lpTotalNumberOfBytes, - NULL // [out, optional] PULARGE_INTEGER lpTotalNumberOfFreeBytes - ); + wcscpy(VolumeEntry->pszFilesystem, L"RAW"); } } - VolumeEntry->VolumeNumber = ulVolumeNumber; - wcscpy(VolumeEntry->VolumeName, pszVolumeName); + if (GetVolumePathNamesForVolumeNameW(pszVolumeName, + szPathNames, + ARRAYSIZE(szPathNames), + &dwLength)) + { + VolumeEntry->DriveLetter = szPathNames[0]; + } InsertTailList(&VolumeListHead, &VolumeEntry->ListEntry); @@ -1313,6 +1469,9 @@ DestroyVolumeList(VOID) if (VolumeEntry->pszFilesystem) RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pszFilesystem); + if (VolumeEntry->pExtents) + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry->pExtents); + /* Release disk entry */ RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeEntry); }

2 years, 7 months

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION LOGICAL

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=863400813abe6c8dd4720… commit 863400813abe6c8dd4720997e7fe36325971967e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 10:05:51 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 10:05:51 2022 +0200 [DISKPART] Implement CREATE PARTITION LOGICAL --- base/system/diskpart/create.c | 173 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 9fa6b189cbf..9617b7c4e60 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -184,13 +184,184 @@ CreateLogicalPartition( _In_ INT argc, _In_ PWSTR *argv) { + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL; + ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif + UCHAR PartitionType = 6; + INT i, length; + PWSTR pszSuffix = NULL; + if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } - ConPrintf(StdOut, L"Not implemented yet!\n"); + for (i = 3; i < argc; i++) + { + if (HasPrefix(argv[i], L"size=", &pszSuffix)) + { + /* size=<N> (MB) */ + DPRINT("Size : %s\n", pszSuffix); + + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) + { + /* offset=<N> (KB) */ + DPRINT("Offset : %s\n", pszSuffix); + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } +#endif + } + else if (HasPrefix(argv[i], L"id=", &pszSuffix)) + { + /* id=<Byte>|<GUID> */ + DPRINT("Id : %s\n", pszSuffix); + + length = wcslen(pszSuffix); + if ((length == 1) || (length == 2)) + { + /* Byte */ + PartitionType = (UCHAR)wcstoul(pszSuffix, NULL, 16); + if ((PartitionType == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } +#if 0 + else if () + { + /* GUID */ + } +#endif + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"align=", &pszSuffix)) + { + /* align=<N> */ + DPRINT("Align : %s\n", pszSuffix); + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif + } + else if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + DPRINT("NoErr\n", pszSuffix); + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + DPRINT1("Size: %I64u\n", ullSize); +#if 0 + DPRINT1("Offset: %I64u\n", ullOffset); +#endif + DPRINT1("Partition Type: %hx\n", PartitionType); + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + for (ListEntry = CurrentDisk->LogicalPartListHead.Flink; + ListEntry != &CurrentDisk->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + continue; + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = TRUE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PartitionType; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + break; + } + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; }

2 years, 7 months

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION EXTENDED and warn about unimplemented options

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52bbf6078ec2ea9e6d046… commit 52bbf6078ec2ea9e6d0467019d6d674de87878b4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 13:17:45 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 13:17:45 2022 +0200 [DISKPART] Implement CREATE PARTITION EXTENDED and warn about unimplemented options --- base/system/diskpart/create.c | 187 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 12 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 095bf4e3d10..9fa6b189cbf 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -14,16 +14,166 @@ BOOL CreateExtendedPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL; + ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif + INT i; + PWSTR pszSuffix = NULL; + if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } - ConPrintf(StdOut, L"Not implemented yet!\n"); + for (i = 3; i < argc; i++) + { + if (HasPrefix(argv[i], L"size=", &pszSuffix)) + { + /* size=<N> (MB) */ + DPRINT("Size : %s\n", pszSuffix); + + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) + { + /* offset=<N> (KB) */ + DPRINT("Offset : %s\n", pszSuffix); + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } +#endif + } + else if (HasPrefix(argv[i], L"align=", &pszSuffix)) + { + /* align=<N> */ + DPRINT("Align : %s\n", pszSuffix); + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif + } + else if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + DPRINT("NoErr\n", pszSuffix); + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + DPRINT1("Size: %I64u\n", ullSize); +#if 0 + DPRINT1("Offset: %I64u\n", ullOffset); +#endif + + if (GetPrimaryPartitionCount(CurrentDisk) >= 4) + { + ConPuts(StdOut, L"No space left for an extended partition!\n"); + return TRUE; + } + + if (CurrentDisk->ExtendedPartition != NULL) + { + ConPuts(StdOut, L"We already have an extended partition on this disk!\n"); + return TRUE; + } + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + ListEntry = CurrentDisk->PrimaryPartListHead.Blink; + + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + { + ConPuts(StdOut, L"No disk space left for an extended partition!\n"); + return TRUE; + } + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PARTITION_EXTENDED; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PARTITION_EXTENDED; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = FALSE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PARTITION_EXTENDED; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; } @@ -31,8 +181,8 @@ CreateExtendedPartition( BOOL CreateLogicalPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { if (CurrentDisk == NULL) { @@ -48,16 +198,19 @@ CreateLogicalPartition( BOOL CreatePrimaryPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { PPARTENTRY PartEntry, NewPartEntry; PLIST_ENTRY ListEntry; - ULONGLONG ullSize = 0ULL, ullOffset = 0ULL; + ULONGLONG ullSize = 0ULL; ULONGLONG ullSectorCount; +#if 0 + ULONGLONG ullOffset = 0ULL; + BOOL bNoErr = FALSE; +#endif UCHAR PartitionType = 6; INT i, length; -// BOOL bNoErr = FALSE; PWSTR pszSuffix = NULL; if (CurrentDisk == NULL) @@ -84,13 +237,15 @@ CreatePrimaryPartition( { /* offset=<N> (KB) */ DPRINT("Offset : %s\n", pszSuffix); - + ConPuts(StdOut, L"The OFFSET option is not supported yet!\n"); +#if 0 ullOffset = _wcstoui64(pszSuffix, NULL, 10); if ((ullOffset == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; } +#endif } else if (HasPrefix(argv[i], L"id=", &pszSuffix)) { @@ -124,13 +279,19 @@ CreatePrimaryPartition( { /* align=<N> */ DPRINT("Align : %s\n", pszSuffix); -// bAlign = TRUE; + ConPuts(StdOut, L"The ALIGN option is not supported yet!\n"); +#if 0 + bAlign = TRUE; +#endif } else if (_wcsicmp(argv[i], L"noerr") == 0) { /* noerr */ DPRINT("NoErr\n", pszSuffix); -// bNoErr = TRUE; + ConPuts(StdOut, L"The NOERR option is not supported yet!\n"); +#if 0 + bNoErr = TRUE; +#endif } else { @@ -140,7 +301,9 @@ CreatePrimaryPartition( } DPRINT1("Size: %I64u\n", ullSize); +#if 0 DPRINT1("Offset: %I64u\n", ullOffset); +#endif DPRINT1("Partition Type: %hx\n", PartitionType); if (GetPrimaryPartitionCount(CurrentDisk) >= 4)

2 years, 7 months

[reactos] 01/01: [DISKPART] Implement CREATE PARTITION PRIMARY and DELETE PARTITION

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=723947eab127001405d07… commit 723947eab127001405d07963f2046e147be6498f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 11:33:29 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 11:33:29 2022 +0200 [DISKPART] Implement CREATE PARTITION PRIMARY and DELETE PARTITION --- base/system/diskpart/create.c | 146 ++++++++-- base/system/diskpart/delete.c | 121 ++++++++ base/system/diskpart/diskpart.h | 34 ++- base/system/diskpart/partlist.c | 630 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 891 insertions(+), 40 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index a933da2c5ae..095bf4e3d10 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -8,6 +8,10 @@ #include "diskpart.h" +#define NDEBUG +#include <debug.h> + + BOOL CreateExtendedPartition( INT argc, @@ -47,32 +51,30 @@ CreatePrimaryPartition( INT argc, PWSTR *argv) { - LARGE_INTEGER liSize, liOffset; - INT i; + PPARTENTRY PartEntry, NewPartEntry; + PLIST_ENTRY ListEntry; + ULONGLONG ullSize = 0ULL, ullOffset = 0ULL; + ULONGLONG ullSectorCount; + UCHAR PartitionType = 6; + INT i, length; // BOOL bNoErr = FALSE; PWSTR pszSuffix = NULL; - liSize.QuadPart = -1; - liOffset.QuadPart = -1; - -/* if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); return TRUE; } -*/ for (i = 3; i < argc; i++) { if (HasPrefix(argv[i], L"size=", &pszSuffix)) { /* size=<N> (MB) */ - ConPrintf(StdOut, L"Size : %s\n", pszSuffix); + DPRINT("Size : %s\n", pszSuffix); - liSize.QuadPart = _wcstoui64(pszSuffix, NULL, 10); - if (((liSize.QuadPart == 0) && (errno == ERANGE)) || - (liSize.QuadPart < 0)) + ullSize = _wcstoui64(pszSuffix, NULL, 10); + if ((ullSize == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; @@ -81,11 +83,10 @@ CreatePrimaryPartition( else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) { /* offset=<N> (KB) */ - ConPrintf(StdOut, L"Offset : %s\n", pszSuffix); + DPRINT("Offset : %s\n", pszSuffix); - liOffset.QuadPart = _wcstoui64(pszSuffix, NULL, 10); - if (((liOffset.QuadPart == 0) && (errno == ERANGE)) || - (liOffset.QuadPart < 0)) + ullOffset = _wcstoui64(pszSuffix, NULL, 10); + if ((ullOffset == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; @@ -94,17 +95,41 @@ CreatePrimaryPartition( else if (HasPrefix(argv[i], L"id=", &pszSuffix)) { /* id=<Byte>|<GUID> */ - ConPrintf(StdOut, L"Id : %s\n", pszSuffix); + DPRINT("Id : %s\n", pszSuffix); + + length = wcslen(pszSuffix); + if ((length == 1) || (length == 2)) + { + /* Byte */ + PartitionType = (UCHAR)wcstoul(pszSuffix, NULL, 16); + if ((PartitionType == 0) && (errno == ERANGE)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } +#if 0 + else if () + { + /* GUID */ + } +#endif + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } } else if (HasPrefix(argv[i], L"align=", &pszSuffix)) { /* align=<N> */ - ConPrintf(StdOut, L"Align : %s\n", pszSuffix); + DPRINT("Align : %s\n", pszSuffix); +// bAlign = TRUE; } else if (_wcsicmp(argv[i], L"noerr") == 0) { /* noerr */ - ConPrintf(StdOut, L"NoErr\n", pszSuffix); + DPRINT("NoErr\n", pszSuffix); // bNoErr = TRUE; } else @@ -114,8 +139,89 @@ CreatePrimaryPartition( } } - ConPrintf(StdOut, L"Size: %I64d\n", liSize.QuadPart); - ConPrintf(StdOut, L"Offset: %I64d\n", liOffset.QuadPart); + DPRINT1("Size: %I64u\n", ullSize); + DPRINT1("Offset: %I64u\n", ullOffset); + DPRINT1("Partition Type: %hx\n", PartitionType); + + if (GetPrimaryPartitionCount(CurrentDisk) >= 4) + { + ConPuts(StdOut, L"No space left for another primary partition!\n"); + return TRUE; + } + + if (ullSize != 0) + ullSectorCount = (ullSize * 1024 * 1024) / CurrentDisk->BytesPerSector; + else + ullSectorCount = 0; + + DPRINT1("SectorCount: %I64u\n", ullSectorCount); + + for (ListEntry = CurrentDisk->PrimaryPartListHead.Flink; + ListEntry != &CurrentDisk->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + continue; + + if (ullSectorCount == 0) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else + { + if (PartEntry->SectorCount.QuadPart == ullSectorCount) + { + PartEntry->IsPartitioned = TRUE; + PartEntry->New = TRUE; + PartEntry->PartitionType = PartitionType; + PartEntry->FormatState = Unformatted; + PartEntry->FileSystemName[0] = L'\0'; + + CurrentDisk->Dirty = TRUE; + break; + } + else if (PartEntry->SectorCount.QuadPart > ullSectorCount) + { + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PPARTENTRY)); + if (NewPartEntry == NULL) + { + ConPuts(StdOut, L"Memory allocation failed!\n"); + return TRUE; + } + + NewPartEntry->DiskEntry = PartEntry->DiskEntry; + + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = ullSectorCount; + + NewPartEntry->LogicalPartition = FALSE; + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->New = TRUE; + NewPartEntry->PartitionType = PartitionType; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystemName[0] = L'\0'; + + PartEntry->StartSector.QuadPart += ullSectorCount; + PartEntry->SectorCount.QuadPart -= ullSectorCount; + + InsertTailList(ListEntry, &NewPartEntry->ListEntry); + + CurrentDisk->Dirty = TRUE; + break; + } + } + } + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); return TRUE; } diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index de712944dcc..c17498bd863 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -8,6 +8,9 @@ #include "diskpart.h" +#define NDEBUG +#include <debug.h> + BOOL DeleteDisk( _In_ INT argc, @@ -16,14 +19,132 @@ DeleteDisk( return TRUE; } + BOOL DeletePartition( _In_ INT argc, _In_ PWSTR *argv) { + PPARTENTRY PrevPartEntry; + PPARTENTRY NextPartEntry; + PPARTENTRY LogicalPartEntry; + PLIST_ENTRY Entry; + + DPRINT("DeletePartition()\n"); + + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + if (CurrentPartition == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); + return TRUE; + } + + ASSERT(CurrentPartition->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Clear the system partition if it is being deleted */ +#if 0 + if (List->SystemPartition == PartEntry) + { + ASSERT(List->SystemPartition); + List->SystemPartition = NULL; + } +#endif + + /* Check which type of partition (primary/logical or extended) is being deleted */ + if (CurrentDisk->ExtendedPartition == CurrentPartition) + { + /* An extended partition is being deleted: delete all logical partition entries */ + while (!IsListEmpty(&CurrentDisk->LogicalPartListHead)) + { + Entry = RemoveHeadList(&CurrentDisk->LogicalPartListHead); + LogicalPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + /* Dismount the logical partition */ + DismountVolume(LogicalPartEntry); + + /* Delete it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, LogicalPartEntry); + } + + CurrentDisk->ExtendedPartition = NULL; + } + else + { + /* A primary partition is being deleted: dismount it */ + DismountVolume(CurrentPartition); + } + + /* Adjust the unpartitioned disk space entries */ + + /* Get pointer to previous and next unpartitioned entries */ + PrevPartEntry = GetPrevUnpartitionedEntry(CurrentPartition); + NextPartEntry = GetNextUnpartitionedEntry(CurrentPartition); + + if (PrevPartEntry != NULL && NextPartEntry != NULL) + { + /* Merge the previous, current and next unpartitioned entries */ + + /* Adjust the previous entry length */ + PrevPartEntry->SectorCount.QuadPart += (CurrentPartition->SectorCount.QuadPart + NextPartEntry->SectorCount.QuadPart); + + /* Remove the current and next entries */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + RemoveEntryList(&NextPartEntry->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, NextPartEntry); + } + else if (PrevPartEntry != NULL && NextPartEntry == NULL) + { + /* Merge the current and the previous unpartitioned entries */ + + /* Adjust the previous entry length */ + PrevPartEntry->SectorCount.QuadPart += CurrentPartition->SectorCount.QuadPart; + + /* Remove the current entry */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + } + else if (PrevPartEntry == NULL && NextPartEntry != NULL) + { + /* Merge the current and the next unpartitioned entries */ + + /* Adjust the next entry offset and length */ + NextPartEntry->StartSector.QuadPart = CurrentPartition->StartSector.QuadPart; + NextPartEntry->SectorCount.QuadPart += CurrentPartition->SectorCount.QuadPart; + + /* Remove the current entry */ + RemoveEntryList(&CurrentPartition->ListEntry); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentPartition); + } + else + { + /* Nothing to merge but change the current entry */ + CurrentPartition->IsPartitioned = FALSE; + CurrentPartition->OnDiskPartitionNumber = 0; + CurrentPartition->PartitionNumber = 0; + // CurrentPartition->PartitionIndex = 0; + CurrentPartition->BootIndicator = FALSE; + CurrentPartition->PartitionType = PARTITION_ENTRY_UNUSED; + CurrentPartition->FormatState = Unformatted; + CurrentPartition->FileSystemName[0] = L'\0'; + CurrentPartition->DriveLetter = 0; + RtlZeroMemory(CurrentPartition->VolumeLabel, sizeof(CurrentPartition->VolumeLabel)); + } + + CurrentPartition = NULL; + + UpdateDiskLayout(CurrentDisk); + WritePartitions(CurrentDisk); + return TRUE; } + BOOL DeleteVolume( _In_ INT argc, diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index f13e6724262..218b6030a17 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -94,13 +94,14 @@ typedef struct _PARTENTRY BOOLEAN BootIndicator; UCHAR PartitionType; - ULONG HiddenSectors; + ULONG OnDiskPartitionNumber; ULONG PartitionNumber; ULONG PartitionIndex; CHAR DriveLetter; CHAR VolumeLabel[17]; CHAR FileSystemName[9]; + FORMATSTATE FormatState; BOOLEAN LogicalPartition; @@ -113,8 +114,6 @@ typedef struct _PARTENTRY /* Partition was created automatically. */ BOOLEAN AutoCreate; - FORMATSTATE FormatState; - /* Partition must be checked */ BOOLEAN NeedsCheck; @@ -383,6 +382,11 @@ BOOL offline_main(INT argc, LPWSTR *argv); BOOL online_main(INT argc, LPWSTR *argv); /* partlist.c */ +ULONGLONG +AlignDown( + _In_ ULONGLONG Value, + _In_ ULONG Alignment); + NTSTATUS CreatePartitionList(VOID); @@ -395,6 +399,30 @@ CreateVolumeList(VOID); VOID DestroyVolumeList(VOID); +NTSTATUS +WritePartitions( + _In_ PDISKENTRY DiskEntry); + +VOID +UpdateDiskLayout( + _In_ PDISKENTRY DiskEntry); + +PPARTENTRY +GetPrevUnpartitionedEntry( + _In_ PPARTENTRY PartEntry); + +PPARTENTRY +GetNextUnpartitionedEntry( + _In_ PPARTENTRY PartEntry); + +ULONG +GetPrimaryPartitionCount( + _In_ PDISKENTRY DiskEntry); + +NTSTATUS +DismountVolume( + IN PPARTENTRY PartEntry); + /* recover.c */ BOOL recover_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 6d91e385571..568f902ea38 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -10,6 +10,7 @@ #include "diskpart.h" #include <ntddscsi.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -80,8 +81,8 @@ PVOLENTRY CurrentVolume = NULL; ULONGLONG AlignDown( - IN ULONGLONG Value, - IN ULONG Alignment) + _In_ ULONGLONG Value, + _In_ ULONG Alignment) { ULONGLONG Temp; @@ -102,9 +103,9 @@ GetDriverName( RtlInitUnicodeString(&DiskEntry->DriverName, NULL); - swprintf(KeyName, - L"\\Scsi\\Scsi Port %lu", - DiskEntry->Port); + StringCchPrintfW(KeyName, ARRAYSIZE(KeyName), + L"\\Scsi\\Scsi Port %lu", + DiskEntry->Port); RtlZeroMemory(&QueryTable, sizeof(QueryTable)); @@ -280,7 +281,8 @@ EnumerateBiosDiskEntries(VOID) AdapterCount = 0; while (1) { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -291,7 +293,8 @@ EnumerateBiosDiskEntries(VOID) break; } - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -301,7 +304,8 @@ EnumerateBiosDiskEntries(VOID) { while (1) { - swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -313,7 +317,8 @@ EnumerateBiosDiskEntries(VOID) return; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -335,7 +340,8 @@ EnumerateBiosDiskEntries(VOID) break; } - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); + StringCchPrintfW(Name, ARRAYSIZE(Name), + L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, @@ -420,7 +426,6 @@ AddPartitionToDisk( PartEntry->BootIndicator = PartitionInfo->BootIndicator; PartEntry->PartitionType = PartitionInfo->PartitionType; - PartEntry->HiddenSectors = PartitionInfo->HiddenSectors; PartEntry->LogicalPartition = LogicalPartition; PartEntry->IsPartitioned = TRUE; @@ -849,7 +854,8 @@ AddDiskToList( } Checksum = ~Checksum + 1; - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); + StringCchPrintfW(Identifier, ARRAYSIZE(Identifier), + L"%08x-%08x-A", Checksum, Signature); DPRINT("Identifier: %S\n", Identifier); DiskEntry = RtlAllocateHeap(RtlGetProcessHeap(), @@ -927,8 +933,10 @@ AddDiskToList( (ULONGLONG)DiskGeometry.TracksPerCylinder * (ULONGLONG)DiskGeometry.SectorsPerTrack; - DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; - DiskEntry->CylinderAlignment = DiskGeometry.SectorsPerTrack * DiskGeometry.TracksPerCylinder; +// DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; +// DiskEntry->CylinderAlignment = DiskGeometry.SectorsPerTrack * DiskGeometry.TracksPerCylinder; + DiskEntry->SectorAlignment = (1024 * 1024) / DiskGeometry.BytesPerSector; + DiskEntry->CylinderAlignment = (1024 * 1024) / DiskGeometry.BytesPerSector; DPRINT1("SectorCount: %I64u\n", DiskEntry->SectorCount); DPRINT1("SectorAlignment: %lu\n", DiskEntry->SectorAlignment); @@ -1085,9 +1093,10 @@ CreatePartitionList(VOID) for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) { - swprintf(Buffer, - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, Buffer); @@ -1309,4 +1318,591 @@ DestroyVolumeList(VOID) } } + +NTSTATUS +WritePartitions( + _In_ PDISKENTRY DiskEntry) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE FileHandle; + IO_STATUS_BLOCK Iosb; + ULONG BufferSize; + PPARTITION_INFORMATION PartitionInfo; + ULONG PartitionCount; + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + WCHAR DstPath[MAX_PATH]; + + DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); + + /* If the disk is not dirty, there is nothing to do */ + if (!DiskEntry->Dirty) + return STATUS_SUCCESS; + + StringCchPrintfW(DstPath, ARRAYSIZE(DstPath), + L"\\Device\\Harddisk%lu\\Partition0", + DiskEntry->DiskNumber); + RtlInitUnicodeString(&Name, DstPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + return Status; + } + + // + // FIXME: We first *MUST* use IOCTL_DISK_CREATE_DISK to initialize + // the disk in MBR or GPT format in case the disk was not initialized!! + // For this we must ask the user which format to use. + // + + /* Save the original partition count to be restored later (see comment below) */ + PartitionCount = DiskEntry->LayoutBuffer->PartitionCount; + + /* Set the new disk layout and retrieve its updated version with possibly modified partition numbers */ + BufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((PartitionCount - 1) * sizeof(PARTITION_INFORMATION)); + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_SET_DRIVE_LAYOUT, + DiskEntry->LayoutBuffer, + BufferSize, + DiskEntry->LayoutBuffer, + BufferSize); + NtClose(FileHandle); + + /* + * IOCTL_DISK_SET_DRIVE_LAYOUT calls IoWritePartitionTable(), which converts + * DiskEntry->LayoutBuffer->PartitionCount into a partition *table* count, + * where such a table is expected to enumerate up to 4 partitions: + * partition *table* count == ROUND_UP(PartitionCount, 4) / 4 . + * Due to this we need to restore the original PartitionCount number. + */ + DiskEntry->LayoutBuffer->PartitionCount = PartitionCount; + + /* Check whether the IOCTL_DISK_SET_DRIVE_LAYOUT call succeeded */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("IOCTL_DISK_SET_DRIVE_LAYOUT failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Update the partition numbers */ + + /* Update the primary partition table */ + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; + PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; + } + } + + /* Update the logical partition table */ + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; + PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; + } + } + + /* The layout has been successfully updated, the disk is not dirty anymore */ + DiskEntry->Dirty = FALSE; + + return Status; +} + + +static +BOOLEAN +IsEmptyLayoutEntry( + IN PPARTITION_INFORMATION PartitionInfo) +{ + if (PartitionInfo->StartingOffset.QuadPart == 0 && + PartitionInfo->PartitionLength.QuadPart == 0) + { + return TRUE; + } + + return FALSE; +} + + +static +BOOLEAN +IsSamePrimaryLayoutEntry( + IN PPARTITION_INFORMATION PartitionInfo, + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) +{ + if ((PartitionInfo->StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector) && + (PartitionInfo->PartitionLength.QuadPart == PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector)) + { + return TRUE; + } + + return FALSE; +} + + +ULONG +GetPrimaryPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + for (Entry = DiskEntry->PrimaryPartListHead.Flink; + Entry != &DiskEntry->PrimaryPartListHead; + Entry = Entry->Flink) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + Count++; + } + + return Count; +} + + +static +ULONG +GetLogicalPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + ULONG Count = 0; + + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned) + Count++; + } + + return Count; +} + + +static +BOOLEAN +ReAllocateLayoutBuffer( + IN PDISKENTRY DiskEntry) +{ + PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; + ULONG NewPartitionCount; + ULONG CurrentPartitionCount = 0; + ULONG LayoutBufferSize; + ULONG i; + + DPRINT1("ReAllocateLayoutBuffer()\n"); + + NewPartitionCount = 4 + GetLogicalPartitionCount(DiskEntry) * 4; + + if (DiskEntry->LayoutBuffer) + CurrentPartitionCount = DiskEntry->LayoutBuffer->PartitionCount; + + DPRINT1("CurrentPartitionCount: %lu ; NewPartitionCount: %lu\n", + CurrentPartitionCount, NewPartitionCount); + + if (CurrentPartitionCount == NewPartitionCount) + return TRUE; + + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((NewPartitionCount - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + NewLayoutBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (NewLayoutBuffer == NULL) + { + DPRINT1("Failed to allocate the new layout buffer (size: %lu)\n", LayoutBufferSize); + return FALSE; + } + + NewLayoutBuffer->PartitionCount = NewPartitionCount; + + /* If the layout buffer grows, make sure the new (empty) entries are written to the disk */ + if (NewPartitionCount > CurrentPartitionCount) + { + for (i = CurrentPartitionCount; i < NewPartitionCount; i++) + { + NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + } + } + + DiskEntry->LayoutBuffer = NewLayoutBuffer; + + return TRUE; +} + + +VOID +UpdateDiskLayout( + IN PDISKENTRY DiskEntry) +{ + PPARTITION_INFORMATION PartitionInfo; + PPARTITION_INFORMATION LinkInfo = NULL; + PLIST_ENTRY ListEntry; + PPARTENTRY PartEntry; + LARGE_INTEGER HiddenSectors64; + ULONG Index; + ULONG PartitionNumber = 1; + + DPRINT1("UpdateDiskLayout()\n"); + + /* Resize the layout buffer if necessary */ + if (ReAllocateLayoutBuffer(DiskEntry) == FALSE) + { + DPRINT("ReAllocateLayoutBuffer() failed.\n"); + return; + } + + /* Update the primary partition table */ + Index = 0; + for (ListEntry = DiskEntry->PrimaryPartListHead.Flink; + ListEntry != &DiskEntry->PrimaryPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + PartEntry->PartitionIndex = Index; + + /* Reset the current partition number only for newly-created (unmounted) partitions */ + if (PartEntry->New) + PartEntry->PartitionNumber = 0; + + PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); + + if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) + { + DPRINT1("Updating primary partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; + PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; + PartitionInfo->PartitionType = PartEntry->PartitionType; + PartitionInfo->BootIndicator = PartEntry->BootIndicator; + PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartEntry->PartitionType); + PartitionInfo->RewritePartition = TRUE; + } + + if (!IsContainerPartition(PartEntry->PartitionType)) + PartitionNumber++; + + Index++; + } + } + + ASSERT(Index <= 4); + + /* Update the logical partition table */ + Index = 4; + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; + ListEntry != &DiskEntry->LogicalPartListHead; + ListEntry = ListEntry->Flink) + { + PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry); + + if (PartEntry->IsPartitioned) + { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + PartEntry->PartitionIndex = Index; + + /* Reset the current partition number only for newly-created (unmounted) partitions */ + if (PartEntry->New) + PartEntry->PartitionNumber = 0; + + PartEntry->OnDiskPartitionNumber = PartitionNumber; + + DPRINT1("Updating logical partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; + PartitionInfo->PartitionNumber = PartEntry->PartitionNumber; + PartitionInfo->PartitionType = PartEntry->PartitionType; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartEntry->PartitionType); + PartitionInfo->RewritePartition = TRUE; + + /* Fill the link entry of the previous partition entry */ + if (LinkInfo != NULL) + { + LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->PartitionLength.QuadPart = (PartEntry->StartSector.QuadPart + DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + HiddenSectors64.QuadPart = PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart; + LinkInfo->HiddenSectors = HiddenSectors64.LowPart; + LinkInfo->PartitionNumber = 0; + LinkInfo->PartitionType = PARTITION_EXTENDED; + LinkInfo->BootIndicator = FALSE; + LinkInfo->RecognizedPartition = FALSE; + LinkInfo->RewritePartition = TRUE; + } + + /* Save a pointer to the link entry of the current partition entry */ + LinkInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index + 1]; + + PartitionNumber++; + Index += 4; + } + } + + /* Wipe unused primary partition entries */ + for (Index = GetPrimaryPartitionCount(DiskEntry); Index < 4; Index++) + { + DPRINT1("Primary partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping primary partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + + /* Wipe unused logical partition entries */ + for (Index = 4; Index < DiskEntry->LayoutBuffer->PartitionCount; Index++) + { + if (Index % 4 >= 2) + { + DPRINT1("Logical partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + } + + DiskEntry->Dirty = TRUE; +} + + +PPARTENTRY +GetPrevUnpartitionedEntry( + IN PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + PPARTENTRY PrevPartEntry; + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Blink != ListHead) + { + PrevPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Blink, + PARTENTRY, + ListEntry); + if (!PrevPartEntry->IsPartitioned) + { + ASSERT(PrevPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + return PrevPartEntry; + } + } + + return NULL; +} + + +PPARTENTRY +GetNextUnpartitionedEntry( + IN PPARTENTRY PartEntry) +{ + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + PPARTENTRY NextPartEntry; + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Flink != ListHead) + { + NextPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Flink, + PARTENTRY, + ListEntry); + if (!NextPartEntry->IsPartitioned) + { + ASSERT(NextPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); + return NextPartEntry; + } + } + + return NULL; +} + +NTSTATUS +DismountVolume( + IN PPARTENTRY PartEntry) +{ + NTSTATUS Status; + NTSTATUS LockStatus; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE PartitionHandle; + WCHAR Buffer[MAX_PATH]; + + /* Check whether the partition is valid and was mounted by the system */ + if (!PartEntry->IsPartitioned || + IsContainerPartition(PartEntry->PartitionType) || + !IsRecognizedPartition(PartEntry->PartitionType) || + PartEntry->FormatState == UnknownFormat || + // NOTE: If FormatState == Unformatted but *FileSystem != 0 this means + // it has been usually mounted with RawFS and thus needs to be dismounted. +/* !*PartEntry->FileSystem || */ + PartEntry->PartitionNumber == 0) + { + /* The partition is not mounted, so just return success */ + return STATUS_SUCCESS; + } + + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Open the volume */ + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + PartEntry->DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&Name, Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&PartitionHandle, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Cannot open volume %wZ for dismounting! (Status 0x%lx)\n", &Name, Status); + return Status; + } + + /* Lock the volume */ + LockStatus = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("WARNING: Failed to lock volume! Operations may fail! (Status 0x%lx)\n", LockStatus); + } + + /* Dismount the volume */ + Status = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_DISMOUNT_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to unmount volume (Status 0x%lx)\n", Status); + } + + /* Unlock the volume */ + LockStatus = NtFsControlFile(PartitionHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("Failed to unlock volume (Status 0x%lx)\n", LockStatus); + } + + /* Close the volume */ + NtClose(PartitionHandle); + + return Status; +} + /* EOF */

2 years, 7 months

[reactos] 01/01: [DISKPART] Fix crashes in the interpreter

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166b88f95c1eed0be0340… commit 166b88f95c1eed0be0340a25ba73da5911521159 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 28 09:54:46 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 28 09:54:46 2022 +0200 [DISKPART] Fix crashes in the interpreter --- base/system/diskpart/interpreter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 5e4eafa47ee..d2decf537f1 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -128,20 +128,20 @@ InterpretCmd( for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0)) cmdptr1 = cmdptr; if ((cmdptr2 == NULL) && (argc >= 2) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (wcsicmp(argv[1], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0)) cmdptr2 = cmdptr; if ((cmdptr3 == NULL) && (argc >= 3) && - (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (wcsicmp(argv[1], cmdptr->cmd2) == 0) && - (wcsicmp(argv[2], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL) && (wcsicmp(argv[2], cmdptr->cmd3) == 0)) cmdptr3 = cmdptr; }

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022