X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-context-uid.c;h=da8fb301b9a1da4b9bf618096cdeb9329474cb1c;hb=f39b4a3cbff6d286025bd692aaa24ae6f8efb40b;hp=9e17d5bc5d0af6f279ff252a70353a350ee1fd5d;hpb=a92e844e9e4cc9d5c4a7ec3d1c0738d375430446;p=lttng-modules.git

diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c
index 9e17d5bc..da8fb301 100644
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.c
@@ -11,12 +11,13 @@
 
 #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(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -30,14 +31,13 @@ size_t uid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void uid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 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
@@ -45,13 +45,13 @@ void uid_get_value(void *priv,
 		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.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,
 	uid_record,
 	uid_get_value,