- only mask out the generic rights flags in RtlMapGenericMask()

- only deny access when requested rights can't be granted in IoCheckDesiredAccess()

svn path=/trunk/; revision=14222

diff --git a/reactos/ntoskrnl/io/share.c b/reactos/ntoskrnl/io/share.c
index cac060f..16d6c9c 100644 (file)
--- a/reactos/ntoskrnl/io/share.c
+++ b/reactos/ntoskrnl/io/share.c
@@ -280,12 +280,15 @@ NTSTATUS STDCALL
 IoCheckDesiredAccess(IN OUT PACCESS_MASK DesiredAccess,
                     IN ACCESS_MASK GrantedAccess)
 {
+  PAGED_CODE();
+  
   RtlMapGenericMask(DesiredAccess,
                    IoFileObjectType->Mapping);
-  if ((*DesiredAccess & GrantedAccess) != GrantedAccess)
-    return(STATUS_ACCESS_DENIED);
 
-  return(STATUS_SUCCESS);
+  if ((~(*DesiredAccess) & GrantedAccess) != 0)
+    return STATUS_ACCESS_DENIED;
+  else
+    return STATUS_SUCCESS;
 }
 
 

diff --git a/reactos/ntoskrnl/se/access.c b/reactos/ntoskrnl/se/access.c
index 1e49fce..62687de 100644 (file)
--- a/reactos/ntoskrnl/se/access.c
+++ b/reactos/ntoskrnl/se/access.c
@@ -72,7 +72,7 @@ RtlMapGenericMask (
        if (*AccessMask & GENERIC_ALL)
                *AccessMask |= GenericMapping->GenericAll;
 
-       *AccessMask &= 0x0FFFFFFF;
+       *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
 }
 
 /*