X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-vgid.c;h=a833915f89cb9fa9f2fd4cdd3c3d92cf12778981;hp=0b7516e233b2a214196442ab56a07940bba41f23;hb=HEAD;hpb=f7d06400be7d046205c20277a03f3f31bf5b1703

diff --git a/src/lttng-context-vgid.c b/src/lttng-context-vgid.c
index 0b7516e2..a5a51bfb 100644
--- a/src/lttng-context-vgid.c
+++ b/src/lttng-context-vgid.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 vgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,9 +36,8 @@ void vgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
 	gid_t vgid;
 
-	vgid = lttng_current_vgid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vgid));
-	chan->ops->event_write(ctx, &vgid, sizeof(vgid));
+	vgid = from_kgid_munged(current_user_ns(), current_gid());
+	chan->ops->event_write(ctx, &vgid, sizeof(vgid), lttng_alignof(vgid));
 }
 
 static
@@ -45,13 +45,13 @@ void vgid_get_value(void *priv,
 		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.s64 = lttng_current_vgid();
+	value->u.s64 = from_kgid_munged(current_user_ns(), current_gid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("vgid",
 		lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	vgid_get_size,
 	vgid_record,
 	vgid_get_value,