X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-vsgid.c;h=f54288652f9cf520947a745a43157a85a415a305;hb=435454a76c63eb3f574562aeb8146fba8889b25e;hp=e9b18b670319b618ec8d9da8de557325aa7f099d;hpb=4697aac7ad1bdb932a843d93076418f4048baad3;p=lttng-modules.git

diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c
index e9b18b67..f5428865 100644
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.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 vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
@@ -35,7 +36,7 @@ void vsgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 {
 	gid_t vsgid;
 
-	vsgid = lttng_current_vsgid();
+	vsgid = from_kgid_munged(current_user_ns(), current_sgid());
 	chan->ops->event_write(ctx, &vsgid, sizeof(vsgid), lttng_alignof(vsgid));
 }
 
@@ -44,7 +45,7 @@ void vsgid_get_value(void *priv,
 		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.s64 = lttng_current_vsgid();
+	value->u.s64 = from_kgid_munged(current_user_ns(), current_sgid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(