#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)
static
void vsuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
struct lttng_kernel_ring_buffer_ctx *ctx,
- struct lttng_channel *chan)
+ 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
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,