From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 14 May 2021 19:24:27 +0000 (-0400)
Subject: Fix: shutdown communication socket on -EINVAL
X-Git-Tag: v2.13.0-rc2~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5fb2fe0679458e65ebdd52b69d6359c082664ce6;p=lttng-ust.git

Fix: shutdown communication socket on -EINVAL

Found by Coverity:
>>>     CID 1453150:  Control flow issues  (DEADCODE)
>>>     Execution cannot reach this statement: "(void)ustcomm_shutdown_unix...".

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I151e86167e8467ce3b602ddd0258284e0ef53eaa
---

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index 46a1c89d..784cb75d 100644
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -394,15 +394,15 @@ int lttng_ust_ctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
 	}
 	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 	if (ret < 0) {
+		if (ret == -EINVAL) {
+			/*
+			 * Command unknown from remote end. The communication socket is
+			 * now out-of-sync and needs to be shutdown.
+			 */
+			(void) ustcomm_shutdown_unix_sock(sock);
+		}
 		goto end;
-	} else if (ret == -EINVAL) {
-		/*
-		 * Command unknown from remote end. The communication socket is
-		 * now out-of-sync and needs to be shutdown.
-		 */
-		(void) ustcomm_shutdown_unix_sock(sock);
 	}
-
 	context_data->handle = -1;
 	DBG("Context created successfully");
 	*_context_data = context_data;