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

make sure that an invalid flexnbd signal fd can't break the serve accept loop

Browse Source
This commit is contained in:
Alex Young
2012-06-27 16:17:51 +01:00
parent 94b4fa887c
commit ac3e6692a8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/serve.c
View File

@@ -512,10 +512,13 @@ int server_accept( struct server * params )
union mysockaddr client_address; union mysockaddr client_address;
fd_set fds; fd_set fds;
socklen_t socklen=sizeof(client_address); socklen_t socklen=sizeof(client_address);
/* We select on this fd to receive OS signals (only a few of
* which we're interested in, see flexnbd.c */
int signal_fd = flexnbd_signal_fd( params->flexnbd );
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(params->server_fd, &fds); FD_SET(params->server_fd, &fds);
FD_SET(flexnbd_signal_fd( params->flexnbd ), &fds); if( 0 < signal_fd ) { FD_SET(signal_fd, &fds); }
self_pipe_fd_set( params->close_signal, &fds ); self_pipe_fd_set( params->close_signal, &fds );
self_pipe_fd_set( params->acl_updated_signal, &fds ); self_pipe_fd_set( params->acl_updated_signal, &fds );
@@ -527,7 +530,7 @@ int server_accept( struct server * params )
return 0; return 0;
} }
if ( FD_ISSET( flexnbd_signal_fd( params->flexnbd ), &fds ) ){ if ( 0 < signal_fd && FD_ISSET( signal_fd, &fds ) ){
debug( "Stop signal received." ); debug( "Stop signal received." );
server_close_clients( params ); server_close_clients( params );
return 0; return 0;

1
tests/check_serve.c
View File

@@ -145,6 +145,7 @@ START_TEST( test_acl_update_closes_bad_client )
* a client socket. * a client socket.
*/ */
struct flexnbd flexnbd; struct flexnbd flexnbd;
flexnbd.signal_fd = -1;
struct server * s = server_create( &flexnbd, "127.0.0.7", "0", dummy_file, 0, 0, NULL, 1, 1 ); struct server * s = server_create( &flexnbd, "127.0.0.7", "0", dummy_file, 0, 0, NULL, 1, 1 );
struct acl * new_acl = acl_create( 0, NULL, 1 ); struct acl * new_acl = acl_create( 0, NULL, 1 );
struct client * c; struct client * c;