From: Richard Guy Briggs <rgb@redhat.com>
To: cgroups@vger.kernel.org, containers@lists.linux-foundation.org,
linux-api@vger.kernel.org,
Linux-Audit Mailing List <linux-audit@redhat.com>,
linux-fsdevel@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org
Cc: mszeredi@redhat.com, luto@kernel.org, jlayton@redhat.com,
carlos@redhat.com, viro@zeniv.linux.org.uk, dhowells@redhat.com,
simo@redhat.com, trondmy@primarydata.com, eparis@parisplace.org,
serge@hallyn.com, ebiederm@xmission.com, madzcar@gmail.com,
Richard Guy Briggs <rgb@redhat.com>
Subject: [RFC PATCH V1 12/12] debug! audit: add container id
Date: Thu, 1 Mar 2018 14:41:15 -0500 [thread overview]
Message-ID: <c6da3e0fe8cdd173cf9d5cd090229d3f215bc590.1519930146.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1519930146.git.rgb@redhat.com>
In-Reply-To: <cover.1519930146.git.rgb@redhat.com>
Debugging code for verbose output to aid in development.
---
fs/proc/base.c | 10 ++++++++++
kernel/auditsc.c | 16 ++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/fs/proc/base.c b/fs/proc/base.c
index f66d1e2..63d1ca4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1309,9 +1309,13 @@ static ssize_t proc_containerid_read(struct file *file, char __user *buf,
char tmpbuf[TMPBUFLEN*2];
if (!task)
+ {
+ pr_info("no inode owner");
return -ESRCH;
+ }
length = scnprintf(tmpbuf, TMPBUFLEN*2, "%llu", audit_get_containerid(task));
put_task_struct(task);
+ pr_info("read: pid=%d opid=%d contid=%llu", pid_nr(task_tgid(current)), pid_nr(task_tgid(task)), audit_get_containerid(task));
return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
}
@@ -1324,14 +1328,19 @@ static ssize_t proc_containerid_write(struct file *file, const char __user *buf,
struct task_struct *task = get_proc_task(inode);
if (!task)
+ {
+ pr_info("no inode owner");
return -ESRCH;
+ }
if (*ppos != 0) {
/* No partial writes. */
put_task_struct(task);
+ pr_info("no partial writes");
return -EINVAL;
}
rv = kstrtou64_from_user(buf, count, 10, &containerid);
+ pr_info("write: pid=%d rv=%d count=%ld opid=%d contid=%llu", task_tgid_nr(current), rv, count, task_tgid_nr(task), containerid);
if (rv < 0) {
put_task_struct(task);
return rv;
@@ -1339,6 +1348,7 @@ static ssize_t proc_containerid_write(struct file *file, const char __user *buf,
rv = audit_set_containerid(task, containerid);
put_task_struct(task);
+ //pr_info("audit_set_containerid: rv=%d", rv);
if (rv < 0)
return rv;
return count;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index fcee34e..39e7dc10 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2111,16 +2111,28 @@ static int audit_set_containerid_perm(struct task_struct *task, u64 containerid)
/* Don't allow to set our own containerid */
if (current == task)
+ {
+ pr_info("pid=%d can't set own containerid", task_tgid_nr(task));
return -EPERM;
+ }
/* Don't allow the containerid to be unset */
if (!cid_valid(containerid))
+ {
+ pr_info("can't unset containerid");
return -EINVAL;
+ }
/* if we don't have caps, reject */
if (!capable(CAP_AUDIT_CONTROL))
+ {
+ pr_info("don't have CAP_AUDIT_CONTROL");
return -EPERM;
+ }
/* if containerid is unset, allow */
if (!audit_containerid_set(task))
+ {
+ //pr_info("unset, allow");
return 0;
+ }
/* it is already set, and not inherited from the parent, reject */
ccontainerid = audit_get_containerid(task);
rcu_read_lock();
@@ -2131,7 +2143,11 @@ static int audit_set_containerid_perm(struct task_struct *task, u64 containerid)
ppid = task_tgid_nr(parent);
task_unlock(parent);
if (ccontainerid != pcontainerid)
+ {
+ pr_info("pid=%d already has contid=%llu set, not inherited from ppid=%d with contid=%llu, can't set containerid %llu",
+ task_tgid_nr(task), ccontainerid, ppid, pcontainerid, containerid);
return -EPERM;
+ }
return 0;
}
--
1.8.3.1
next prev parent reply other threads:[~2018-03-01 19:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 19:41 [RFC PATCH V1 00/12] audit: implement container id Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 01/12] audit: add " Richard Guy Briggs
2018-03-02 1:41 ` Richard Guy Briggs
2018-03-02 15:48 ` Paul Moore
2018-03-02 18:23 ` Matthew Wilcox
2018-03-02 19:25 ` Paul Moore
2018-03-02 19:41 ` Paul Moore
2018-03-03 9:19 ` Serge E. Hallyn
2018-03-04 15:01 ` Paul Moore
2018-03-05 8:16 ` Richard Guy Briggs
2018-03-15 20:27 ` Stefan Berger
2018-03-16 3:58 ` Richard Guy Briggs
2018-04-18 18:45 ` Stefan Berger
2018-04-18 19:23 ` Richard Guy Briggs
2018-04-18 19:39 ` Stefan Berger
2018-04-18 19:51 ` Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 02/12] audit: log container info of syscalls Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 03/12] audit: add containerid filtering Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 04/12] audit: read container ID of a process Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 05/12] audit: add containerid support for ptrace and signals Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 06/12] audit: add support for non-syscall auxiliary records Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 07/12] audit: add container aux record to watch/tree/mark Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 08/12] audit: add containerid support for tty_audit Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 09/12] audit: add containerid support for config/feature/user records Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 10/12] audit: add containerid support for seccomp and anom_abend records Richard Guy Briggs
2018-03-01 19:41 ` [RFC PATCH V1 11/12] debug audit: add container id Richard Guy Briggs
2018-03-01 19:41 ` Richard Guy Briggs [this message]
2018-03-04 21:55 ` [RFC PATCH V1 00/12] audit: implement " Mimi Zohar
2018-03-05 3:31 ` Richard Guy Briggs
2018-03-05 13:27 ` Mimi Zohar
2018-03-06 15:04 ` Serge E. Hallyn
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=c6da3e0fe8cdd173cf9d5cd090229d3f215bc590.1519930146.git.rgb@redhat.com \
--to=rgb@redhat.com \
--cc=carlos@redhat.com \
--cc=cgroups@vger.kernel.org \
--cc=containers@lists.linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=eparis@parisplace.org \
--cc=jlayton@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-audit@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=madzcar@gmail.com \
--cc=mszeredi@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=simo@redhat.com \
--cc=trondmy@primarydata.com \
--cc=viro@zeniv.linux.org.uk \
/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).