X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-vsuid.c;h=e48654c8ebb93343f04a120f51a8955e16a58463;hb=6d0471df5846249bd61278ff6191676cb075b871;hp=38b0a71e5171695f56903c56078e67f12ad0dcd2;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git

diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c
index 38b0a71e..e48654c8 100644
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.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 vsuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t vsuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -29,29 +30,28 @@ size_t vsuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs
 }
 
 static
-void vsuid_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void vsuid_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 vsuid;
 
-	vsuid = lttng_current_vsuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
-	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid));
+	vsuid = from_kuid_munged(current_user_ns(), current_suid());
+	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid), lttng_alignof(vsuid));
 }
 
 static
 void vsuid_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.s64 = lttng_current_vsuid();
+	value->u.s64 = from_kuid_munged(current_user_ns(), current_suid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("vsuid",
 		lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	vsuid_get_size,
 	vsuid_record,
 	vsuid_get_value,