From: Jeremy Kerr Date: Thu, 16 May 2013 08:40:39 +0000 (+0800) Subject: discover: fix error handling from failed client writes X-Git-Tag: v1.0.0~599 X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=57ee6ff66071deb4e03f414ed00433061b8bef93 discover: fix error handling from failed client writes Signed-off-by: Jeremy Kerr --- diff --git a/discover/discover-server.c b/discover/discover-server.c index 2509457..4ba91ee 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -203,8 +203,8 @@ static int discover_server_process_message(void *arg) static int discover_server_process_connection(void *arg) { struct discover_server *server = arg; + int fd, rc, i, n_devices; struct client *client; - int fd, i, n_devices; /* accept the incoming connection */ fd = accept(server->socket, NULL, 0); @@ -229,11 +229,16 @@ static int discover_server_process_connection(void *arg) const struct discover_device *device; device = device_handler_get_device(server->device_handler, i); - write_device_add_message(server, client, device->device); + rc = write_device_add_message(server, client, device->device); + if (rc) + return 0; - list_for_each_entry(&device->boot_options, opt, list) - write_boot_option_add_message(server, client, + list_for_each_entry(&device->boot_options, opt, list) { + rc = write_boot_option_add_message(server, client, opt->option); + if (rc) + return 0; + } } client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,