From: David Goulet <dgoulet@efficios.com>
Date: Mon, 21 Jan 2013 15:50:44 +0000 (-0500)
Subject: Fix: improve error handling for UST stream creation
X-Git-Tag: v2.1.2~28
X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=3a040d366f457b5d3150ef751ed71ca2aae7fdf8

Fix: improve error handling for UST stream creation

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 6430c83f7..85f705542 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2288,11 +2288,16 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			ret = ustctl_create_stream(app->sock, ua_chan->obj,
 					&ustream->obj);
 			if (ret < 0) {
-				/* Got all streams */
-				lttng_fd_put(LTTNG_FD_APPS, 2);
+				/* Free unused memory and reset FD states. */
 				free(ustream);
+				lttng_fd_put(LTTNG_FD_APPS, 2);
+				if (ret == -ENOENT) {
+					/* Got all streams. Continue normal execution. */
+					break;
+				}
+				/* Error at this point. Stop everything. */
 				ret = LTTNG_ERR_UST_STREAM_FAIL;
-				break;
+				goto error_rcu_unlock;
 			}
 			ustream->handle = ustream->obj->handle;