From: Andrey Vagin <avagin@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: Andrey Vagin <avagin@openvz.org>, Oleg Nesterov <oleg@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Pavel Emelyanov <xemul@parallels.com>,
Roger Luethi <rl@hellgate.ch>, Arnd Bergmann <arnd@arndb.de>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
David Ahern <dsahern@gmail.com>,
Andy Lutomirski <luto@amacapital.net>,
Pavel Odintsov <pavel.odintsov@gmail.com>
Subject: [PATCH 05/15] task_diag: add a new group to get process credentials
Date: Mon, 11 Apr 2016 16:35:45 -0700 [thread overview]
Message-ID: <1460417755-18201-6-git-send-email-avagin@openvz.org> (raw)
In-Reply-To: <1460417755-18201-1-git-send-email-avagin@openvz.org>
A response is represented by the task_diag_creds structure:
struct task_diag_creds {
struct task_diag_caps cap_inheritable;
struct task_diag_caps cap_permitted;
struct task_diag_caps cap_effective;
struct task_diag_caps cap_bset;
__u32 uid;
__u32 euid;
__u32 suid;
__u32 fsuid;
__u32 gid;
__u32 egid;
__u32 sgid;
__u32 fsgid;
};
This group is optional and it's filled only if show_flags contains
TASK_DIAG_SHOW_CRED.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
---
fs/proc/task_diag.c | 50 ++++++++++++++++++++++++++++++++++++++++++
include/uapi/linux/task_diag.h | 21 ++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/fs/proc/task_diag.c b/fs/proc/task_diag.c
index 3c2127e..fc31771 100644
--- a/fs/proc/task_diag.c
+++ b/fs/proc/task_diag.c
@@ -80,6 +80,48 @@ static int fill_task_base(struct task_struct *p,
return 0;
}
+static inline void caps2diag(struct task_diag_caps *diag, const kernel_cap_t *cap)
+{
+ int i;
+
+ for (i = 0; i < _LINUX_CAPABILITY_U32S_3; i++)
+ diag->cap[i] = cap->cap[i];
+}
+
+static int fill_creds(struct task_struct *p, struct sk_buff *skb,
+ struct user_namespace *user_ns)
+{
+ struct task_diag_creds *diag_cred;
+ const struct cred *cred;
+ struct nlattr *attr;
+
+ attr = nla_reserve(skb, TASK_DIAG_CRED, sizeof(struct task_diag_creds));
+ if (!attr)
+ return -EMSGSIZE;
+
+ diag_cred = nla_data(attr);
+
+ cred = get_task_cred(p);
+
+ caps2diag(&diag_cred->cap_inheritable, &cred->cap_inheritable);
+ caps2diag(&diag_cred->cap_permitted, &cred->cap_permitted);
+ caps2diag(&diag_cred->cap_effective, &cred->cap_effective);
+ caps2diag(&diag_cred->cap_bset, &cred->cap_bset);
+
+ diag_cred->uid = from_kuid_munged(user_ns, cred->uid);
+ diag_cred->euid = from_kuid_munged(user_ns, cred->euid);
+ diag_cred->suid = from_kuid_munged(user_ns, cred->suid);
+ diag_cred->fsuid = from_kuid_munged(user_ns, cred->fsuid);
+ diag_cred->gid = from_kgid_munged(user_ns, cred->gid);
+ diag_cred->egid = from_kgid_munged(user_ns, cred->egid);
+ diag_cred->sgid = from_kgid_munged(user_ns, cred->sgid);
+ diag_cred->fsgid = from_kgid_munged(user_ns, cred->fsgid);
+
+ put_cred(cred);
+
+ return 0;
+}
+
static int task_diag_fill(struct task_struct *tsk, struct sk_buff *skb,
struct task_diag_pid *req,
struct task_diag_cb *cb, struct pid_namespace *pidns,
@@ -113,6 +155,14 @@ static int task_diag_fill(struct task_struct *tsk, struct sk_buff *skb,
i++;
}
+ if (show_flags & TASK_DIAG_SHOW_CRED) {
+ if (i >= n)
+ err = fill_creds(tsk, skb, userns);
+ if (err)
+ goto err;
+ i++;
+ }
+
nlmsg_end(skb, nlh);
if (cb)
cb->attr = 0;
diff --git a/include/uapi/linux/task_diag.h b/include/uapi/linux/task_diag.h
index ba0f71a..ea500c6 100644
--- a/include/uapi/linux/task_diag.h
+++ b/include/uapi/linux/task_diag.h
@@ -15,12 +15,14 @@ struct task_diag_msg {
enum {
TASK_DIAG_BASE = 0,
+ TASK_DIAG_CRED,
__TASK_DIAG_ATTR_MAX
#define TASK_DIAG_ATTR_MAX (__TASK_DIAG_ATTR_MAX - 1)
};
#define TASK_DIAG_SHOW_BASE (1ULL << TASK_DIAG_BASE)
+#define TASK_DIAG_SHOW_CRED (1ULL << TASK_DIAG_CRED)
enum {
TASK_DIAG_RUNNING,
@@ -45,6 +47,25 @@ struct task_diag_base {
char comm[TASK_DIAG_COMM_LEN];
};
+struct task_diag_caps {
+ __u32 cap[_LINUX_CAPABILITY_U32S_3];
+};
+
+struct task_diag_creds {
+ struct task_diag_caps cap_inheritable;
+ struct task_diag_caps cap_permitted;
+ struct task_diag_caps cap_effective;
+ struct task_diag_caps cap_bset;
+
+ __u32 uid;
+ __u32 euid;
+ __u32 suid;
+ __u32 fsuid;
+ __u32 gid;
+ __u32 egid;
+ __u32 sgid;
+ __u32 fsgid;
+};
#define TASK_DIAG_DUMP_ALL 0
#define TASK_DIAG_DUMP_ONE 1
--
2.5.5
next prev parent reply other threads:[~2016-04-11 23:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 23:35 [PATCH 0/15] task_diag: add a new interface to get information about processes (v3) Andrey Vagin
2016-04-11 23:35 ` [PATCH 01/15] proc: pick out a function to iterate task children Andrey Vagin
2016-04-11 23:35 ` [PATCH 02/15] proc: export task_first_tid() and task_next_tid() Andrey Vagin
2016-04-11 23:35 ` [PATCH 03/15] proc: export next_tgid() Andrey Vagin
2016-04-11 23:35 ` [PATCH 04/15] task_diag: add a new interface to get information about tasks (v4) Andrey Vagin
2016-04-12 1:03 ` kbuild test robot
2016-04-13 0:45 ` Andrew Vagin
2016-04-12 7:08 ` Cyrill Gorcunov
2016-04-13 0:39 ` Andrew Vagin
2016-04-13 5:26 ` Cyrill Gorcunov
2016-04-11 23:35 ` Andrey Vagin [this message]
2016-04-11 23:35 ` [PATCH 06/15] task_diag: add a new group to get tasks memory mappings (v2) Andrey Vagin
2016-04-11 23:35 ` [PATCH 07/15] task_diag: add ability to dump children and threads Andrey Vagin
2016-04-11 23:35 ` [PATCH 08/15] task_diag: Only add VMAs for thread_group leader Andrey Vagin
2016-04-11 23:35 ` [PATCH 09/15] task_diag: add a flag to mark incomplete messages Andrey Vagin
2016-04-11 23:35 ` [PATCH 10/15] task_diag: add a new group to get resource usage Andrey Vagin
2016-04-11 23:35 ` [PATCH 11/15] task_diag: add a new group to get memory usage Andrey Vagin
2016-04-11 23:35 ` [PATCH 12/15] Documentation: add documentation for task_diag Andrey Vagin
2016-04-11 23:35 ` [PATCH 13/15] selftest: check the task_diag functinonality Andrey Vagin
2016-04-11 23:35 ` [PATCH 14/15] task_diag: Enhance fork tool to spawn threads Andrey Vagin
2016-04-11 23:35 ` [PATCH 15/15] test: check that task_diag can dump all thread of one process Andrey Vagin
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=1460417755-18201-6-git-send-email-avagin@openvz.org \
--to=avagin@openvz.org \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=dsahern@gmail.com \
--cc=gorcunov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=oleg@redhat.com \
--cc=pavel.odintsov@gmail.com \
--cc=rl@hellgate.ch \
--cc=xemul@parallels.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
all inboxes | Powered by JetHome®