X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=0272d9b9331c6750c276993b14552bbeb6e565f2;hb=a834901f2890deadb815d7f9e3ab79c3ba673994;hp=7d2c05a9a9edb7002bbc28aae4daa9f3767945aa;hpb=38980ed1d67fee8112224294cba927d25dcfd08d;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 7d2c05a9..0272d9b9 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -20,6 +20,8 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include <lttng/ust-config.h>
 #include <lttng/ust-ctl.h>
@@ -36,6 +38,7 @@
 #include "../liblttng-ust/lttng-rb-clients.h"
 #include "../liblttng-ust/clock.h"
 #include "../liblttng-ust/getenv.h"
+#include "../liblttng-ust/lttng-tracer-core.h"
 
 #include "../libcounter/shm.h"
 #include "../libcounter/smp.h"
@@ -99,9 +102,13 @@ extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_32_modular_init(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_32_modular_exit(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_64_modular_init(void);
+LTTNG_HIDDEN
 extern void lttng_counter_client_percpu_64_modular_exit(void);
 
 int ustctl_release_handle(int sock, int handle)
@@ -562,6 +569,7 @@ int ustctl_create_event_notifier(int sock, struct lttng_ust_event_notifier *even
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
 	struct lttng_ust_object_data *event_notifier_data;
+	ssize_t len;
 	int ret;
 
 	if (!event_notifier_group || !_event_notifier_data)
@@ -576,15 +584,22 @@ int ustctl_create_event_notifier(int sock, struct lttng_ust_event_notifier *even
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = event_notifier_group->handle;
 	lum.cmd = LTTNG_UST_EVENT_NOTIFIER_CREATE;
+	lum.u.event_notifier.len = sizeof(*event_notifier);
 
-	strncpy(lum.u.event_notifier.event.name, event_notifier->event.name,
-		LTTNG_UST_SYM_NAME_LEN);
-	lum.u.event_notifier.event.instrumentation = event_notifier->event.instrumentation;
-	lum.u.event_notifier.event.loglevel_type = event_notifier->event.loglevel_type;
-	lum.u.event_notifier.event.loglevel = event_notifier->event.loglevel;
-	lum.u.event_notifier.event.token = event_notifier->event.token;
-	lum.u.event_notifier.error_counter_index = event_notifier->error_counter_index;
-	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret) {
+		free(event_notifier_data);
+		return ret;
+	}
+	/* Send struct lttng_ust_event_notifier */
+	len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
+	if (len != sizeof(*event_notifier)) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 	if (ret) {
 		free(event_notifier_data);
 		return ret;
@@ -2009,6 +2024,104 @@ int ustctl_has_perf_counters(void)
 
 #endif
 
+#ifdef __linux__
+/*
+ * Override application pid/uid/gid with unix socket credentials. If
+ * the application announced a pid matching our view, it means it is
+ * within the same pid namespace, so expose the ppid provided by the
+ * application.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct ucred ucred;
+	socklen_t ucred_len = sizeof(struct ucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &ucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ pid: %u, uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %u, ppid: %u, uid: %u, gid: %u ]",
+		ucred.pid, ucred.uid, ucred.gid,
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	if (!ucred.pid) {
+		ERR("Unix socket credential pid=0. Refusing application in distinct, non-nested pid namespace.");
+		return -LTTNG_UST_ERR_PEERCRED_PID;
+	}
+	*pid = ucred.pid;
+	*uid = ucred.uid;
+	*gid = ucred.gid;
+	if (ucred.pid == reg_msg->pid) {
+		*ppid = reg_msg->ppid;
+	} else {
+		*ppid = 0;
+	}
+	return 0;
+}
+#elif defined(__FreeBSD__)
+#include <sys/ucred.h>
+
+/*
+ * Override application uid/gid with unix socket credentials. Use the
+ * first group of the cr_groups.
+ * Use the pid and ppid provided by the application on registration.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct xucred xucred;
+	socklen_t xucred_len = sizeof(struct xucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, LOCAL_PEERCRED, &xucred, &xucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	if (xucred.cr_version != XUCRED_VERSION || xucred.cr_ngroups < 1) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %d, ppid: %d, uid: %u, gid: %u ]",
+		xucred.uid, xucred.cr_groups[0],
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = xucred.uid;
+	*gid = xucred.cr_groups[0];
+	return 0;
+}
+#else
+#warning "Using insecure fallback: trusting user id provided by registered applications. Please consider implementing use of unix socket credentials on your platform."
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	DBG("Application registered claiming [ pid: %u, ppid: %d, uid: %u, gid: %u ]",
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = reg_msg->uid;
+	*gid = reg_msg->gid;
+	return 0;
+}
+#endif
+
 /*
  * Returns 0 on success, negative error value on error.
  */
@@ -2059,10 +2172,6 @@ int ustctl_recv_reg_msg(int sock,
 	}
 	*major = reg_msg.major;
 	*minor = reg_msg.minor;
-	*pid = reg_msg.pid;
-	*ppid = reg_msg.ppid;
-	*uid = reg_msg.uid;
-	*gid = reg_msg.gid;
 	*bits_per_long = reg_msg.bits_per_long;
 	*uint8_t_alignment = reg_msg.uint8_t_alignment;
 	*uint16_t_alignment = reg_msg.uint16_t_alignment;
@@ -2074,8 +2183,7 @@ int ustctl_recv_reg_msg(int sock,
 			reg_msg.major > LTTNG_UST_ABI_MAJOR_VERSION) {
 		return -LTTNG_UST_ERR_UNSUP_MAJOR;
 	}
-
-	return 0;
+	return get_cred(sock, &reg_msg, pid, ppid, uid, gid);
 }
 
 int ustctl_recv_notify(int sock, enum ustctl_notify_cmd *notify_cmd)