From: Richard Guy Briggs <rgb@redhat.com> To: 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, netfilter-devel@vger.kernel.org Cc: Paul Moore <paul@paul-moore.com>, sgrubb@redhat.com, omosnace@redhat.com, dhowells@redhat.com, simo@redhat.com, eparis@parisplace.org, serge@hallyn.com, ebiederm@xmission.com, nhorman@tuxdriver.com, dwalsh@redhat.com, mpatel@redhat.com, Richard Guy Briggs <rgb@redhat.com> Subject: [PATCH ghak90 V9 03/13] audit: read container ID of a process Date: Sat, 27 Jun 2020 09:20:36 -0400 [thread overview] Message-ID: <37acbd05281e060abd868cc42663fe36d810aefd.1593198710.git.rgb@redhat.com> (raw) In-Reply-To: <cover.1593198710.git.rgb@redhat.com> In-Reply-To: <cover.1593198710.git.rgb@redhat.com> Add support for reading the audit container identifier from the proc filesystem. This is a read from the proc entry of the form /proc/PID/audit_containerid where PID is the process ID of the task whose audit container identifier is sought. The read expects up to a u64 value (unset: 18446744073709551615). This read requires CAP_AUDIT_CONTROL. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Acked-by: Serge Hallyn <serge@hallyn.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com> --- fs/proc/base.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 6c17ab32e71b..794474cd8f35 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1234,7 +1234,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf, }; #ifdef CONFIG_AUDIT -#define TMPBUFLEN 11 +#define TMPBUFLEN 21 static ssize_t proc_loginuid_read(struct file * file, char __user * buf, size_t count, loff_t *ppos) { @@ -1318,6 +1318,24 @@ static ssize_t proc_sessionid_read(struct file * file, char __user * buf, .llseek = generic_file_llseek, }; +static ssize_t proc_contid_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + struct inode *inode = file_inode(file); + struct task_struct *task = get_proc_task(inode); + ssize_t length; + char tmpbuf[TMPBUFLEN]; + + if (!task) + return -ESRCH; + /* if we don't have caps, reject */ + if (!capable(CAP_AUDIT_CONTROL)) + return -EPERM; + length = scnprintf(tmpbuf, TMPBUFLEN, "%llu", audit_get_contid(task)); + put_task_struct(task); + return simple_read_from_buffer(buf, count, ppos, tmpbuf, length); +} + static ssize_t proc_contid_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -1348,6 +1366,7 @@ static ssize_t proc_contid_write(struct file *file, const char __user *buf, } static const struct file_operations proc_contid_operations = { + .read = proc_contid_read, .write = proc_contid_write, .llseek = generic_file_llseek, }; @@ -3253,7 +3272,7 @@ static int proc_stack_depth(struct seq_file *m, struct pid_namespace *ns, #ifdef CONFIG_AUDIT REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("audit_containerid", S_IWUSR, proc_contid_operations), + REG("audit_containerid", S_IWUSR|S_IRUSR, proc_contid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), @@ -3593,7 +3612,7 @@ static int proc_tid_comm_permission(struct inode *inode, int mask) #ifdef CONFIG_AUDIT REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("audit_containerid", S_IWUSR, proc_contid_operations), + REG("audit_containerid", S_IWUSR|S_IRUSR, proc_contid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Richard Guy Briggs <rgb@redhat.com> To: 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, netfilter-devel@vger.kernel.org Cc: nhorman@tuxdriver.com, Richard Guy Briggs <rgb@redhat.com>, dhowells@redhat.com, ebiederm@xmission.com, simo@redhat.com, eparis@parisplace.org, mpatel@redhat.com, serge@hallyn.com Subject: [PATCH ghak90 V9 03/13] audit: read container ID of a process Date: Sat, 27 Jun 2020 09:20:36 -0400 [thread overview] Message-ID: <37acbd05281e060abd868cc42663fe36d810aefd.1593198710.git.rgb@redhat.com> (raw) In-Reply-To: <cover.1593198710.git.rgb@redhat.com> In-Reply-To: <cover.1593198710.git.rgb@redhat.com> Add support for reading the audit container identifier from the proc filesystem. This is a read from the proc entry of the form /proc/PID/audit_containerid where PID is the process ID of the task whose audit container identifier is sought. The read expects up to a u64 value (unset: 18446744073709551615). This read requires CAP_AUDIT_CONTROL. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Acked-by: Serge Hallyn <serge@hallyn.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com> --- fs/proc/base.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 6c17ab32e71b..794474cd8f35 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1234,7 +1234,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf, }; #ifdef CONFIG_AUDIT -#define TMPBUFLEN 11 +#define TMPBUFLEN 21 static ssize_t proc_loginuid_read(struct file * file, char __user * buf, size_t count, loff_t *ppos) { @@ -1318,6 +1318,24 @@ static ssize_t proc_sessionid_read(struct file * file, char __user * buf, .llseek = generic_file_llseek, }; +static ssize_t proc_contid_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + struct inode *inode = file_inode(file); + struct task_struct *task = get_proc_task(inode); + ssize_t length; + char tmpbuf[TMPBUFLEN]; + + if (!task) + return -ESRCH; + /* if we don't have caps, reject */ + if (!capable(CAP_AUDIT_CONTROL)) + return -EPERM; + length = scnprintf(tmpbuf, TMPBUFLEN, "%llu", audit_get_contid(task)); + put_task_struct(task); + return simple_read_from_buffer(buf, count, ppos, tmpbuf, length); +} + static ssize_t proc_contid_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -1348,6 +1366,7 @@ static ssize_t proc_contid_write(struct file *file, const char __user *buf, } static const struct file_operations proc_contid_operations = { + .read = proc_contid_read, .write = proc_contid_write, .llseek = generic_file_llseek, }; @@ -3253,7 +3272,7 @@ static int proc_stack_depth(struct seq_file *m, struct pid_namespace *ns, #ifdef CONFIG_AUDIT REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("audit_containerid", S_IWUSR, proc_contid_operations), + REG("audit_containerid", S_IWUSR|S_IRUSR, proc_contid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), @@ -3593,7 +3612,7 @@ static int proc_tid_comm_permission(struct inode *inode, int mask) #ifdef CONFIG_AUDIT REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("audit_containerid", S_IWUSR, proc_contid_operations), + REG("audit_containerid", S_IWUSR|S_IRUSR, proc_contid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), -- 1.8.3.1 -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2020-06-27 13:22 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-27 13:20 [PATCH ghak90 V9 00/13] audit: implement container identifier Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 01/13] audit: collect audit task parameters Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:09 ` Paul Moore 2020-07-05 15:09 ` Paul Moore 2020-07-07 2:50 ` Richard Guy Briggs 2020-07-07 2:50 ` Richard Guy Briggs 2020-07-08 1:42 ` Paul Moore 2020-07-08 1:42 ` Paul Moore 2020-07-13 20:29 ` Richard Guy Briggs 2020-07-13 20:29 ` Richard Guy Briggs 2020-07-14 0:44 ` Paul Moore 2020-07-14 0:44 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 02/13] audit: add container id Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-04 13:29 ` Paul Moore 2020-07-04 13:29 ` Paul Moore 2020-07-04 13:30 ` Paul Moore 2020-07-04 13:30 ` Paul Moore 2020-07-05 15:09 ` Paul Moore 2020-07-05 15:09 ` Paul Moore 2020-07-29 20:05 ` Richard Guy Briggs 2020-07-29 20:05 ` Richard Guy Briggs 2020-08-21 19:36 ` Paul Moore 2020-08-21 19:36 ` Paul Moore 2020-06-27 13:20 ` Richard Guy Briggs [this message] 2020-06-27 13:20 ` [PATCH ghak90 V9 03/13] audit: read container ID of a process Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 04/13] audit: log drop of contid on exit of last task Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:10 ` Paul Moore 2020-07-05 15:10 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 05/13] audit: log container info of syscalls Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:10 ` Paul Moore 2020-07-05 15:10 ` Paul Moore 2020-07-29 19:40 ` Richard Guy Briggs 2020-07-29 19:40 ` Richard Guy Briggs 2020-08-21 19:15 ` Paul Moore 2020-08-21 19:15 ` Paul Moore 2020-10-02 19:52 ` Richard Guy Briggs 2020-10-02 19:52 ` Richard Guy Briggs 2020-10-02 19:52 ` Richard Guy Briggs 2020-10-21 16:39 ` Richard Guy Briggs 2020-10-21 16:39 ` Richard Guy Briggs 2020-10-21 16:39 ` Richard Guy Briggs 2020-10-21 16:49 ` Steve Grubb 2020-10-21 16:49 ` Steve Grubb 2020-10-21 16:49 ` Steve Grubb 2020-10-21 17:53 ` Richard Guy Briggs 2020-10-21 17:53 ` Richard Guy Briggs 2020-10-21 17:53 ` Richard Guy Briggs 2020-10-23 1:21 ` Paul Moore 2020-10-23 1:21 ` Paul Moore 2020-10-23 1:21 ` Paul Moore 2020-10-23 20:40 ` Richard Guy Briggs 2020-10-23 20:40 ` Richard Guy Briggs 2020-10-23 20:40 ` Richard Guy Briggs 2020-10-28 1:35 ` Paul Moore 2020-10-28 1:35 ` Paul Moore 2020-10-28 1:35 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 06/13] audit: add contid support for signalling the audit daemon Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:10 ` Paul Moore 2020-07-05 15:10 ` Paul Moore 2020-07-29 19:00 ` Richard Guy Briggs 2020-07-29 19:00 ` Richard Guy Briggs 2020-08-21 18:48 ` Paul Moore 2020-08-21 18:48 ` Paul Moore 2020-10-02 19:25 ` Richard Guy Briggs 2020-10-02 19:25 ` Richard Guy Briggs 2020-10-02 19:25 ` Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 07/13] audit: add support for non-syscall auxiliary records Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 08/13] audit: add containerid support for user records Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore 2020-07-18 0:43 ` Richard Guy Briggs 2020-07-18 0:43 ` Richard Guy Briggs 2020-08-21 18:34 ` Paul Moore 2020-08-21 18:34 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 09/13] audit: add containerid filtering Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 10/13] audit: add support for containerid to network namespaces Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore 2020-07-21 22:05 ` Richard Guy Briggs 2020-07-21 22:05 ` Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 11/13] audit: contid check descendancy and nesting Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore 2020-08-07 17:10 ` Richard Guy Briggs 2020-08-07 17:10 ` Richard Guy Briggs 2020-08-21 20:13 ` Paul Moore 2020-08-21 20:13 ` Paul Moore 2020-10-06 20:03 ` Richard Guy Briggs 2020-10-06 20:03 ` Richard Guy Briggs 2020-10-06 20:03 ` Richard Guy Briggs 2020-06-27 13:20 ` [PATCH ghak90 V9 12/13] audit: track container nesting Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore 2020-06-27 13:20 ` [PATCH ghak90 V9 13/13] audit: add capcontid to set contid outside init_user_ns Richard Guy Briggs 2020-06-27 13:20 ` Richard Guy Briggs 2020-07-05 15:11 ` Paul Moore 2020-07-05 15:11 ` Paul Moore
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=37acbd05281e060abd868cc42663fe36d810aefd.1593198710.git.rgb@redhat.com \ --to=rgb@redhat.com \ --cc=containers@lists.linux-foundation.org \ --cc=dhowells@redhat.com \ --cc=dwalsh@redhat.com \ --cc=ebiederm@xmission.com \ --cc=eparis@parisplace.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-audit@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mpatel@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=netfilter-devel@vger.kernel.org \ --cc=nhorman@tuxdriver.com \ --cc=omosnace@redhat.com \ --cc=paul@paul-moore.com \ --cc=serge@hallyn.com \ --cc=sgrubb@redhat.com \ --cc=simo@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.