From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Michael Jeanson <mjeanson@efficios.com>
Cc: lttng-dev <lttng-dev@lists.lttng.org>
Subject: Re: [PATCH lttng-modules] fix: use user ns wrapper code in new id trackers
Date: Tue, 17 Dec 2019 12:23:33 -0500 (EST) [thread overview]
Message-ID: <1879153712.8837.1576603413126.JavaMail.zimbra__23148.9095532865$1576603457$gmane$org@efficios.com> (raw)
In-Reply-To: <20191217171111.6782-2-mjeanson@efficios.com>
Merged into master, thanks!
Mathieu
----- On Dec 17, 2019, at 12:11 PM, Michael Jeanson mjeanson@efficios.com wrote:
> These wrappers are required to translate kuid on kernels prior to v3.5.
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> probes/lttng-tracepoint-event-impl.h | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/probes/lttng-tracepoint-event-impl.h
> b/probes/lttng-tracepoint-event-impl.h
> index 39454fb..321cdfa 100644
> --- a/probes/lttng-tracepoint-event-impl.h
> +++ b/probes/lttng-tracepoint-event-impl.h
> @@ -11,7 +11,6 @@
> #include <linux/rculist.h>
> #include <asm/byteorder.h>
> #include <linux/swab.h>
> -#include <linux/uidgid.h>
>
> #include <probes/lttng.h>
> #include <probes/lttng-types.h>
> @@ -20,6 +19,7 @@
> #include <wrapper/ringbuffer/frontend_types.h>
> #include <wrapper/ringbuffer/backend.h>
> #include <wrapper/rcu.h>
> +#include <wrapper/user_namespace.h>
> #include <lttng-events.h>
> #include <lttng-tracer-core.h>
> #include <lttng-tp-mempool.h>
> @@ -1146,19 +1146,19 @@ static void __event_probe__##_name(void *__data, _proto)
> \
> return; \
> __lf = lttng_rcu_dereference(__session->uid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kuid(&init_user_ns, current_uid())))) \
> + lttng_current_uid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->vuid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kuid(current_user_ns(), current_uid())))) \
> + lttng_current_vuid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->gid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kgid(&init_user_ns, current_gid())))) \
> + lttng_current_gid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->vgid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kgid(current_user_ns(), current_gid())))) \
> + lttng_current_vgid()))) \
> return; \
> __orig_dynamic_len_offset = this_cpu_ptr(<tng_dynamic_len_stack)->offset; \
> __dynamic_len_idx = __orig_dynamic_len_offset; \
> @@ -1239,19 +1239,19 @@ static void __event_probe__##_name(void *__data)
> \
> return; \
> __lf = lttng_rcu_dereference(__session->uid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kuid(&init_user_ns, current_uid())))) \
> + lttng_current_uid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->vuid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kuid(current_user_ns(), current_uid())))) \
> + lttng_current_vuid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->gid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kgid(&init_user_ns, current_gid())))) \
> + lttng_current_gid()))) \
> return; \
> __lf = lttng_rcu_dereference(__session->vgid_tracker.p); \
> if (__lf && likely(!lttng_id_tracker_lookup(__lf, \
> - from_kgid(current_user_ns(), current_gid())))) \
> + lttng_current_vgid()))) \
> return; \
> __orig_dynamic_len_offset = this_cpu_ptr(<tng_dynamic_len_stack)->offset; \
> __dynamic_len_idx = __orig_dynamic_len_offset; \
> --
> 2.17.1
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
prev parent reply other threads:[~2019-12-17 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191217171111.6782-1-mjeanson@efficios.com>
2019-12-17 17:11 ` [PATCH lttng-modules] fix: use user ns wrapper code in new id trackers Michael Jeanson
2019-12-17 17:23 ` [PATCH lttng-modules] fix: function prototype in wrapper/mm.h Mathieu Desnoyers
[not found] ` <20191217171111.6782-2-mjeanson@efficios.com>
2019-12-17 17:23 ` Mathieu Desnoyers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='1879153712.8837.1576603413126.JavaMail.zimbra__23148.9095532865$1576603457$gmane$org@efficios.com' \
--to=mathieu.desnoyers@efficios.com \
--cc=lttng-dev@lists.lttng.org \
--cc=mjeanson@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).