X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-vsgid.c;h=c6a6ea7c8a30571b94c65ce5680e0f8283e8b680;hp=0ca4f08853c5705623e338a2d50182c8e16f48da;hb=HEAD;hpb=437d5aa59380583ce1cd14d394a53b398be1275d

diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c
index 0ca4f088..f5428865 100644
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.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 vsgid_get_size(size_t offset)
+size_t vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -29,31 +30,29 @@ size_t vsgid_get_size(size_t offset)
 }
 
 static
-void vsgid_record(struct lttng_kernel_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void vsgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	gid_t vsgid;
 
-	vsgid = lttng_current_vsgid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsgid));
-	chan->ops->event_write(ctx, &vsgid, sizeof(vsgid));
+	vsgid = from_kgid_munged(current_user_ns(), current_sgid());
+	chan->ops->event_write(ctx, &vsgid, sizeof(vsgid), lttng_alignof(vsgid));
 }
 
 static
-void vsgid_get_value(struct lttng_kernel_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void vsgid_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
-	value->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(
 	lttng_kernel_static_event_field("vsgid",
 		lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	vsgid_get_size,
-	NULL,
 	vsgid_record,
 	vsgid_get_value,
 	NULL, NULL);