X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-uid.c;h=c48bd0a6e6b6773b0659b028e3d6d9ade558e2e5;hp=841d2ea726a1341b100f7d16a709da6d7546dd29;hb=HEAD;hpb=437d5aa59380583ce1cd14d394a53b398be1275d

diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c
index 841d2ea7..da8fb301 100644
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.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 uid_get_size(size_t offset)
+size_t uid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -29,31 +30,29 @@ size_t uid_get_size(size_t offset)
 }
 
 static
-void uid_record(struct lttng_kernel_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void uid_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 uid;
 
-	uid = lttng_current_uid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(uid));
-	chan->ops->event_write(ctx, &uid, sizeof(uid));
+	uid = from_kuid_munged(&init_user_ns, current_uid());
+	chan->ops->event_write(ctx, &uid, sizeof(uid), lttng_alignof(uid));
 }
 
 static
-void uid_get_value(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void uid_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
-	value->s64 = lttng_current_uid();
+	value->u.s64 = from_kuid_munged(&init_user_ns, current_uid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("uid",
 		lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	uid_get_size,
-	NULL,
 	uid_record,
 	uid_get_value,
 	NULL, NULL);