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 V8 03/16] audit: read container ID of a process Date: Tue, 31 Dec 2019 14:48:16 -0500 Message-ID: <05ba38492e83101df4d2aea72c3adda041e46fcf.1577736799.git.rgb@redhat.com> (raw) In-Reply-To: <cover.1577736799.git.rgb@redhat.com> In-Reply-To: <cover.1577736799.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 e2e7c9f4702f..26091800180c 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1224,7 +1224,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) { @@ -1308,6 +1308,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) { @@ -1338,6 +1356,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, }; @@ -3101,7 +3120,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), @@ -3502,7 +3521,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
next prev parent reply index Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-31 19:48 [PATCH ghak90 V8 00/16] audit: implement container identifier Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 01/16] audit: collect audit task parameters Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 02/16] audit: add container id Richard Guy Briggs 2020-01-22 21:28 ` Paul Moore 2020-01-30 17:53 ` Richard Guy Briggs 2019-12-31 19:48 ` Richard Guy Briggs [this message] 2019-12-31 19:48 ` [PATCH ghak90 V8 04/16] audit: convert to contid list to check for orch/engine ownership Richard Guy Briggs 2020-01-22 21:28 ` Paul Moore 2020-02-04 22:51 ` Richard Guy Briggs 2020-02-05 22:40 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 05/16] audit: log drop of contid on exit of last task Richard Guy Briggs 2020-01-22 21:28 ` Paul Moore 2020-02-04 23:02 ` Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 06/16] audit: log container info of syscalls Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 07/16] audit: add contid support for signalling the audit daemon Richard Guy Briggs 2020-01-22 21:28 ` Paul Moore 2020-01-23 16:29 ` Richard Guy Briggs 2020-01-23 17:09 ` Paul Moore 2020-01-23 20:04 ` Richard Guy Briggs 2020-01-23 21:35 ` Paul Moore 2020-02-04 23:14 ` Richard Guy Briggs 2020-02-05 22:50 ` Paul Moore 2020-02-12 22:38 ` Steve Grubb 2020-02-13 0:09 ` Paul Moore 2020-02-13 21:44 ` Paul Moore 2020-03-12 19:30 ` Richard Guy Briggs 2020-03-13 16:29 ` Paul Moore 2020-03-13 18:59 ` Richard Guy Briggs 2020-03-18 20:56 ` Paul Moore 2020-03-18 21:26 ` Richard Guy Briggs 2020-03-18 21:42 ` Paul Moore 2020-03-18 21:55 ` Richard Guy Briggs 2020-03-18 22:06 ` Paul Moore 2020-03-19 22:02 ` Richard Guy Briggs 2020-03-24 0:16 ` Paul Moore 2020-03-24 21:01 ` Richard Guy Briggs 2020-03-29 3:11 ` Paul Moore 2020-03-30 13:47 ` Richard Guy Briggs 2020-03-30 14:26 ` Paul Moore 2020-03-30 16:21 ` Richard Guy Briggs 2020-03-30 17:34 ` Paul Moore 2020-03-30 17:49 ` Richard Guy Briggs 2020-03-30 19:55 ` Paul Moore 2020-04-16 20:33 ` Eric W. Biederman 2020-04-16 21:53 ` Paul Moore 2020-04-17 22:23 ` Eric W. Biederman 2020-04-22 17:24 ` Paul Moore 2020-06-08 18:03 ` Richard Guy Briggs 2020-06-17 21:33 ` Paul Moore 2020-06-19 15:22 ` Richard Guy Briggs 2020-03-12 20:27 ` Richard Guy Briggs 2020-03-13 16:42 ` Paul Moore 2020-03-13 16:45 ` Steve Grubb 2020-03-13 16:49 ` Paul Moore 2020-03-13 19:23 ` Richard Guy Briggs 2020-03-18 21:01 ` Paul Moore 2020-03-18 21:41 ` Richard Guy Briggs 2020-03-18 21:47 ` Paul Moore 2020-03-19 21:47 ` Richard Guy Briggs 2020-03-20 21:56 ` Paul Moore 2020-03-25 12:29 ` Richard Guy Briggs 2020-03-29 3:17 ` Paul Moore 2020-03-30 15:23 ` Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 08/16] audit: add support for non-syscall auxiliary records Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 09/16] audit: add containerid support for user records Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 10/16] audit: add containerid filtering Richard Guy Briggs 2019-12-31 19:48 ` [PATCH ghak90 V8 11/16] audit: add support for containerid to network namespaces Richard Guy Briggs 2020-01-22 21:28 ` Paul Moore 2020-02-04 23:42 ` Richard Guy Briggs 2020-02-05 22:51 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 12/16] audit: contid check descendancy and nesting Richard Guy Briggs 2020-01-22 21:29 ` Paul Moore 2020-01-23 21:02 ` Richard Guy Briggs 2020-01-23 21:47 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 13/16] audit: track container nesting Richard Guy Briggs 2020-01-22 21:29 ` Paul Moore 2020-01-30 19:27 ` Richard Guy Briggs 2020-02-05 23:05 ` Paul Moore 2020-02-05 23:50 ` Richard Guy Briggs 2020-02-13 21:49 ` Paul Moore 2020-03-12 20:51 ` Richard Guy Briggs 2020-03-13 16:47 ` Paul Moore 2020-03-14 22:42 ` Richard Guy Briggs 2020-03-17 18:28 ` Richard Guy Briggs 2020-03-18 21:08 ` Paul Moore 2020-01-31 14:50 ` Steve Grubb 2020-02-04 13:19 ` Richard Guy Briggs 2020-02-04 15:47 ` Steve Grubb 2020-02-04 15:52 ` Paul Moore 2020-02-04 18:12 ` Steve Grubb 2020-02-05 22:57 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 14/16] audit: check contid depth and add limit config param Richard Guy Briggs 2020-01-22 21:29 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 15/16] audit: check contid count per netns and add config param limit Richard Guy Briggs 2020-01-22 21:29 ` Paul Moore 2019-12-31 19:48 ` [PATCH ghak90 V8 16/16] audit: add capcontid to set contid outside init_user_ns Richard Guy Briggs 2020-01-22 21:29 ` Paul Moore 2020-02-05 0:39 ` Richard Guy Briggs 2020-02-05 22:56 ` Paul Moore 2020-02-06 12:51 ` Richard Guy Briggs 2020-02-13 21:58 ` Paul Moore 2020-03-12 21:58 ` Richard Guy Briggs
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=05ba38492e83101df4d2aea72c3adda041e46fcf.1577736799.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: link
Linux-Fsdevel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-fsdevel/0 linux-fsdevel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-fsdevel linux-fsdevel/ https://lore.kernel.org/linux-fsdevel \ linux-fsdevel@vger.kernel.org public-inbox-index linux-fsdevel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-fsdevel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git