X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=6e1dd60fd6b060a1437589a6594b30c0e69deefe;hp=030358241f663548265493bd2459c00977be0013;hb=799e2c4f4ecb595fcb52c3e6affd3b4ec7b5b24e;hpb=df0f840ba686e3fe670c9906fd46330fff65da07 diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 030358241..6e1dd60fd 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -198,7 +198,10 @@ void delete_ust_app(struct ust_app *app) * closing this socket, otherwise an application could re-use the socket ID * and race with the teardown, using the same hash table entry. */ - close(sock); + ret = close(sock); + if (ret) { + PERROR("close"); + } DBG2("UST app pid %d deleted", app->key.pid); free(app); @@ -1268,20 +1271,27 @@ error: int ust_app_register(struct ust_register_msg *msg, int sock) { struct ust_app *lta; + int ret; if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL) || (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) { ERR("Registration failed: application \"%s\" (pid: %d) has " "%d-bit long, but no consumerd for this long size is available.\n", msg->name, msg->pid, msg->bits_per_long); - close(sock); + ret = close(sock); + if (ret) { + PERROR("close"); + } return -EINVAL; } if (msg->major != LTTNG_UST_COMM_MAJOR) { ERR("Registration failed: application \"%s\" (pid: %d) has " "communication protocol version %u.%u, but sessiond supports 2.x.\n", msg->name, msg->pid, msg->major, msg->minor); - close(sock); + ret = close(sock); + if (ret) { + PERROR("close"); + } return -EINVAL; } lta = zmalloc(sizeof(struct ust_app));