bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid a use-after-free in serve.c

Browse Source
This commit is contained in:
Alex Young
2012-06-21 14:15:58 +01:00
parent c054403208
commit cc22f50fe6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/serve.c
View File

@@ -91,12 +91,17 @@ struct server * server_create (
void server_destroy( struct server * serve ) void server_destroy( struct server * serve )
{ {
self_pipe_destroy( serve->acl_updated_signal ); self_pipe_destroy( serve->acl_updated_signal );
serve->acl_updated_signal = NULL;
self_pipe_destroy( serve->close_signal ); self_pipe_destroy( serve->close_signal );
serve->close_signal = NULL;
pthread_mutex_destroy( &serve->l_acl ); pthread_mutex_destroy( &serve->l_acl );
pthread_mutex_destroy( &serve->l_io ); pthread_mutex_destroy( &serve->l_io );
if ( serve->acl ) { acl_destroy( serve->acl ); } if ( serve->acl ) {
acl_destroy( serve->acl );
serve->acl = NULL;
}
free( serve ); free( serve );
} }
@@ -583,9 +588,6 @@ void serve_cleanup(struct server* params,
if (params->control_fd){ close(params->control_fd); } if (params->control_fd){ close(params->control_fd); }
if (params->control_socket_name){ ; } if (params->control_socket_name){ ; }
if (params->close_signal) {
self_pipe_destroy( params->close_signal );
}
if (params->allocation_map) { if (params->allocation_map) {
free(params->allocation_map); free(params->allocation_map);
} }