marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Don't do access checks on the security descriptors of newly created objects.

oldstable
Rob Shearman 2007-11-05 14:23:36 +00:00 committed by Alexandre Julliard
parent a1b02c2cec
commit 92db6d2c2f
7 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel32/tests/sync.c
View File

@ -278,7 +278,6 @@ static void test_event_security(void)
InitializeAcl(&acl, sizeof(acl), ACL_REVISION); InitializeAcl(&acl, sizeof(acl), ACL_REVISION);
SetSecurityDescriptorDacl(&sd, TRUE, &acl, FALSE); SetSecurityDescriptorDacl(&sd, TRUE, &acl, FALSE);
handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event");
todo_wine
ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError());
CloseHandle(handle); CloseHandle(handle);
} }

5
server/event.c
View File

@ -187,7 +187,10 @@ DECL_HANDLER(create_event)
if ((event = create_event( root, &name, req->attributes, req->manual_reset, req->initial_state, sd ))) if ((event = create_event( root, &name, req->attributes, req->manual_reset, req->initial_state, sd )))
{ {
reply->handle = alloc_handle( current->process, event, req->access, req->attributes ); if (get_error() == STATUS_OBJECT_NAME_EXISTS)
reply->handle = alloc_handle( current->process, event, req->access, req->attributes );
else
reply->handle = alloc_handle_no_access_check( current->process, event, req->access, req->attributes );
release_object( event ); release_object( event );
} }

2
server/handle.c
View File

@ -226,7 +226,7 @@ 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 */ /* return the handle, or 0 on error */
static obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr )
{ {
struct object *obj = ptr; struct object *obj = ptr;

2
server/handle.h
View File

@ -36,6 +36,8 @@ struct unicode_str;
/* that the thing pointed to starts with a struct object... */ /* that the thing pointed to starts with a struct object... */
extern obj_handle_t alloc_handle( struct process *process, void *obj, extern obj_handle_t alloc_handle( struct process *process, void *obj,
unsigned int access, unsigned int attr ); unsigned int access, unsigned int attr );
extern obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr,
unsigned int access, unsigned int attr );
extern int close_handle( struct process *process, obj_handle_t handle ); extern int close_handle( struct process *process, obj_handle_t handle );
extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, extern struct object *get_handle_obj( struct process *process, obj_handle_t handle,
unsigned int access, const struct object_ops *ops ); unsigned int access, const struct object_ops *ops );

5
server/mapping.c
View File

@ -415,7 +415,10 @@ DECL_HANDLER(create_mapping)
if ((obj = create_mapping( root, &name, req->attributes, req->size, req->protect, req->file_handle, sd ))) if ((obj = create_mapping( root, &name, req->attributes, req->size, req->protect, req->file_handle, sd )))
{ {
reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); if (get_error() == STATUS_OBJECT_NAME_EXISTS)
reply->handle = alloc_handle( current->process, obj, req->access, req->attributes );
else
reply->handle = alloc_handle_no_access_check( current->process, obj, req->access, req->attributes );
release_object( obj ); release_object( obj );
} }

5
server/mutex.c
View File

@ -212,7 +212,10 @@ DECL_HANDLER(create_mutex)
if ((mutex = create_mutex( root, &name, req->attributes, req->owned, sd ))) if ((mutex = create_mutex( root, &name, req->attributes, req->owned, sd )))
{ {
reply->handle = alloc_handle( current->process, mutex, req->access, req->attributes ); if (get_error() == STATUS_OBJECT_NAME_EXISTS)
reply->handle = alloc_handle( current->process, mutex, req->access, req->attributes );
else
reply->handle = alloc_handle_no_access_check( current->process, mutex, req->access, req->attributes );
release_object( mutex ); release_object( mutex );
} }

5
server/semaphore.c
View File

@ -187,7 +187,10 @@ DECL_HANDLER(create_semaphore)
if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max, sd ))) if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max, sd )))
{ {
reply->handle = alloc_handle( current->process, sem, req->access, req->attributes ); if (get_error() == STATUS_OBJECT_NAME_EXISTS)
reply->handle = alloc_handle( current->process, sem, req->access, req->attributes );
else
reply->handle = alloc_handle_no_access_check( current->process, sem, req->access, req->attributes );
release_object( sem ); release_object( sem );
} }