X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-euid.c;h=92c2868172015308fa5a9899cd03af51b74441a9;hb=6d0471df5846249bd61278ff6191676cb075b871;hp=3888da1dba3b4e2e63f575d3d6bbbb2bb4e589fc;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git

diff --git a/src/lttng-context-euid.c b/src/lttng-context-euid.c
index 3888da1d..92c28681 100644
--- a/src/lttng-context-euid.c
+++ b/src/lttng-context-euid.c
@@ -11,15 +11,16 @@
 
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/user_namespace.h>
+
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/user_namespace.h>
 
 static
-size_t euid_get_size(size_t offset)
+size_t euid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -29,31 +30,29 @@ size_t euid_get_size(size_t offset)
 }
 
 static
-void euid_record(struct lttng_kernel_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void euid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	uid_t euid;
 
-	euid = lttng_current_euid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(euid));
-	chan->ops->event_write(ctx, &euid, sizeof(euid));
+	euid = from_kuid_munged(&init_user_ns, current_euid());
+	chan->ops->event_write(ctx, &euid, sizeof(euid), lttng_alignof(euid));
 }
 
 static
-void euid_get_value(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void euid_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
-	value->s64 = lttng_current_euid();
+	value->u.s64 = from_kuid_munged(&init_user_ns, current_euid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("euid",
 		lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	euid_get_size,
-	NULL,
 	euid_record,
 	euid_get_value,
 	NULL, NULL);