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

diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c
index f7d5226b..e48654c8 100644
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.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 vsuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,7 +36,7 @@ void vsuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
 	uid_t vsuid;
 
-	vsuid = lttng_current_vsuid();
+	vsuid = from_kuid_munged(current_user_ns(), current_suid());
 	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid), lttng_alignof(vsuid));
 }
 
@@ -44,7 +45,7 @@ void vsuid_get_value(void *priv,
 		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(