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

server: Map new handle access even when not checking it.

This commit is contained in:
Alexandre Julliard 2013-08-26 14:00:30 +02:00
parent 33406f51be
commit 4654d871b2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/handle.c
View File

@ -235,12 +235,12 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned
} }
/* allocate a handle for an object, incrementing its refcount */ /* allocate a handle for an object, incrementing its refcount */
/* return the handle, or 0 on error */ static obj_handle_t alloc_handle_entry( struct process *process, void *ptr,
obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) unsigned int access, unsigned int attr )
{ {
struct object *obj = ptr; struct object *obj = ptr;
access &= ~RESERVED_ALL; assert( !(access & RESERVED_ALL) );
if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT;
if (!process->handles) if (!process->handles)
{ {
@ -250,15 +250,24 @@ obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, u
return alloc_entry( process->handles, obj, access ); return alloc_entry( process->handles, obj, access );
} }
/* allocate a handle for an object, incrementing its refcount */
/* return the handle, or 0 on error */
obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr )
{
struct object *obj = ptr;
access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL;
return alloc_handle_entry( process, ptr, access, attr );
}
/* allocate a handle for an object, checking the dacl allows the process to */ /* allocate a handle for an object, checking the dacl allows the process to */
/* access it and incrementing its refcount */ /* access it and incrementing its refcount */
/* return the handle, or 0 on error */ /* return the handle, or 0 on error */
obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int access, unsigned int attr ) obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int access, unsigned int attr )
{ {
struct object *obj = ptr; struct object *obj = ptr;
access = obj->ops->map_access( obj, access ); access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL;
if (access && !check_object_access( obj, &access )) return 0; if (access && !check_object_access( obj, &access )) return 0;
return alloc_handle_no_access_check( process, ptr, access, attr ); return alloc_handle_entry( process, ptr, access, attr );
} }
/* allocate a global handle for an object, incrementing its refcount */ /* allocate a global handle for an object, incrementing its refcount */
@ -539,7 +548,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str
res = src_handle; res = src_handle;
} }
else else
res = alloc_handle_no_access_check( dst, obj, access, attr ); res = alloc_handle_entry( dst, obj, access, attr );
} }
release_object( obj ); release_object( obj );