X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-context-suid.c;h=1aa52dc54aca7ea4002400037f3725bad1fc0f9b;hp=4d9b5af34ff74d07cfef20396cede5b69baa1d06;hb=HEAD;hpb=8a57ec025ffbe56153748fd69b60118862707182 diff --git a/src/lttng-context-suid.c b/src/lttng-context-suid.c index 4d9b5af3..a478b7bf 100644 --- a/src/lttng-context-suid.c +++ b/src/lttng-context-suid.c @@ -11,12 +11,13 @@ #include #include +#include + #include #include #include #include #include -#include static size_t suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) @@ -31,13 +32,12 @@ size_t suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_ static void suid_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 suid; - suid = lttng_current_suid(); - lib_ring_buffer_align_ctx(ctx, lttng_alignof(suid)); - chan->ops->event_write(ctx, &suid, sizeof(suid)); + suid = from_kuid_munged(&init_user_ns, current_suid()); + chan->ops->event_write(ctx, &suid, sizeof(suid), lttng_alignof(suid)); } static @@ -45,13 +45,13 @@ void suid_get_value(void *priv, struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { - value->u.s64 = lttng_current_suid(); + value->u.s64 = from_kuid_munged(&init_user_ns, current_suid()); } static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field( lttng_kernel_static_event_field("suid", lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10), - false, false, false), + false, false), suid_get_size, suid_record, suid_get_value,