X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fuserspace-probe.c;h=508c9e8d4480a8a99216e7a3792a6555dd534d3f;hp=6331ff13574e9f03e14a4dc426284fe97390e526;hb=38b6c4f5eb49d404ff3f2248b017cea415c49618;hpb=cc8313098a2e4e28b0bae7539dd234d8b9fe6211

diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c
index 6331ff135..508c9e8d4 100644
--- a/src/common/userspace-probe.c
+++ b/src/common/userspace-probe.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <assert.h>
@@ -276,6 +266,7 @@ lttng_userspace_probe_location_tracepoint_create_no_check(const char *binary_pat
 error:
 	free(probe_name_copy);
 	free(provider_name_copy);
+	free(binary_path_copy);
 	if (binary_fd >= 0) {
 		if (close(binary_fd)) {
 			PERROR("Error closing binary fd in error path");
@@ -404,7 +395,7 @@ lttng_userspace_probe_location_function_copy(
 	struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
 	const char *binary_path = NULL;
 	const char *function_name = NULL;
-	int fd;
+	int fd, new_fd;
 
 	assert(location);
 	assert(location->type == LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION);
@@ -423,8 +414,14 @@ lttng_userspace_probe_location_function_copy(
 	}
 
 	/* Duplicate the binary fd */
-	fd = dup(lttng_userspace_probe_location_function_get_binary_fd(location));
+	fd = lttng_userspace_probe_location_function_get_binary_fd(location);
 	if (fd == -1) {
+		ERR("Error getting file descriptor to binary");
+		goto error;
+	}
+
+	new_fd = dup(fd);
+	if (new_fd == -1) {
 		PERROR("Error duplicating file descriptor to binary");
 		goto error;
 	}
@@ -456,7 +453,7 @@ lttng_userspace_probe_location_function_copy(
 	}
 
 	/* Set the duplicated fd to the new probe_location */
-	if (lttng_userspace_probe_location_function_set_binary_fd(new_location, fd) < 0) {
+	if (lttng_userspace_probe_location_function_set_binary_fd(new_location, new_fd) < 0) {
 		goto destroy_probe_location;
 	}
 
@@ -467,7 +464,7 @@ destroy_probe_location:
 destroy_lookup_method:
 	lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
 close_fd:
-	if (close(fd) < 0) {
+	if (close(new_fd) < 0) {
 		PERROR("Error closing duplicated file descriptor in error path");
 	}
 error:
@@ -486,7 +483,7 @@ lttng_userspace_probe_location_tracepoint_copy(
 	const char *binary_path = NULL;
 	const char *probe_name = NULL;
 	const char *provider_name = NULL;
-	int fd;
+	int fd, new_fd;
 
 	assert(location);
 	assert(location->type == LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT);
@@ -511,8 +508,14 @@ lttng_userspace_probe_location_tracepoint_copy(
 	}
 
 	/* Duplicate the binary fd */
-	fd = dup(lttng_userspace_probe_location_tracepoint_get_binary_fd(location));
+	fd = lttng_userspace_probe_location_tracepoint_get_binary_fd(location);
 	if (fd == -1) {
+		ERR("Error getting file descriptor to binary");
+		goto error;
+	}
+
+	new_fd = dup(fd);
+	if (new_fd == -1) {
 		PERROR("Error duplicating file descriptor to binary");
 		goto error;
 	}
@@ -544,7 +547,7 @@ lttng_userspace_probe_location_tracepoint_copy(
 	}
 
 	/* Set the duplicated fd to the new probe_location */
-	if (lttng_userspace_probe_location_tracepoint_set_binary_fd(new_location, fd) < 0) {
+	if (lttng_userspace_probe_location_tracepoint_set_binary_fd(new_location, new_fd) < 0) {
 		goto destroy_probe_location;
 	}
 
@@ -555,7 +558,7 @@ destroy_probe_location:
 destroy_lookup_method:
 	lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
 close_fd:
-	if (close(fd) < 0) {
+	if (close(new_fd) < 0) {
 		PERROR("Error closing duplicated file descriptor in error path");
 	}
 error: