X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=wrapper%2Fuser_namespace.h;h=5e0ab5ace684cfb4af41fc6c7133c719b2616a2e;hb=cf77d12083b5092eca8c6f9899ec0892756845aa;hp=701f3189b5c97f8e1f006c175e0bbd755d66b052;hpb=dc923e75c174ee4e7a80e5f9af1dfd39fb8346ea;p=deliverable%2Flttng-modules.git

diff --git a/wrapper/user_namespace.h b/wrapper/user_namespace.h
index 701f3189..5e0ab5ac 100644
--- a/wrapper/user_namespace.h
+++ b/wrapper/user_namespace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * wrapper/user_namespace.h
  *
@@ -27,6 +27,30 @@
 #define lttng_current_vxxgid(xxx)				\
 	(from_kgid_munged(current_user_ns(), current_##xxx()))
 
+static inline
+uid_t lttng_task_vuid(struct task_struct *p, struct user_namespace *ns)
+{
+	uid_t uid;
+	kuid_t kuid;
+
+	kuid = task_cred_xxx(p, uid);
+	uid = from_kuid_munged(ns, kuid);
+
+	return uid;
+}
+
+static inline
+gid_t lttng_task_vgid(struct task_struct *p, struct user_namespace *ns)
+{
+	gid_t gid;
+	kgid_t kgid;
+
+	kgid = task_cred_xxx(p, gid);
+	gid = from_kgid_munged(ns, kgid);
+
+	return gid;
+}
+
 #else
 
 #define lttng_current_xxuid(xxx)	(current_##xxx())
@@ -38,6 +62,37 @@
 
 #define lttng_current_vxxgid(xxx)					\
 	(user_ns_map_gid(current_user_ns(), current_cred(), current_##xxx()))
+
+static inline
+uid_t lttng_task_vuid(struct task_struct *p, struct user_namespace *ns)
+{
+	uid_t uid;
+
+	/*
+	 * __task_cred requires the RCU readlock be held
+	 */
+	rcu_read_lock();
+	uid = user_ns_map_uid(ns, __task_cred(p), __task_cred(p)->uid);
+	rcu_read_unlock();
+
+	return uid;
+}
+
+static inline
+gid_t lttng_task_vgid(struct task_struct *p, struct user_namespace *ns)
+{
+	gid_t gid;
+
+	/*
+	 * __task_cred requires the RCU readlock be held
+	 */
+	rcu_read_lock();
+	gid = user_ns_map_gid(ns, __task_cred(p), __task_cred(p)->gid);
+	rcu_read_unlock();
+
+	return gid;
+}
+
 #endif
 
 #define lttng_current_uid()	(lttng_current_xxuid(uid))