Received: by 10.223.185.116 with SMTP id b49csp7828712wrg; Thu, 1 Mar 2018 11:51:59 -0800 (PST) X-Google-Smtp-Source: AG47ELtsFRA4DeiJnV1L/uMXEq6hgCIcdcOeMV/PQC0bVcl6Rjp0+GinbgBEjD4CE2hg5dOq4DTk X-Received: by 10.98.204.132 with SMTP id j4mr3116654pfk.35.1519933919258; Thu, 01 Mar 2018 11:51:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519933919; cv=none; d=google.com; s=arc-20160816; b=rEteZXf7/0xl5IivuTdPbLMx6BSgpAiG642lbizMBNJC9MVrEijIKFOgHwvFARJbYl yQ2Yq7vhfDn9idySX39jkrFkToqRoL5BGpCW/kWjOzGhP+2E4FF/ti7YZsdymD+pbval NW0U8BeHcuH5eK7LzFbLuvsnegLHayovwoIr1xjkqhvneV9s8yMp+fRr5yXbywgBTNW2 l9lmbxcYwVhS7pPvbiIjcL4znaAxDWoWzZ4ZWXZZ+5S/TTrnQdOOlLjM0Ag9peU0NjX/ 6P3ssn5RuMY2QwYlPiNPB8i+X47X7EfzOeT8vFdNMMPTvqkVX9D2Cy3fRoXn0ph3BjXL zptw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=orOME6QxfLjWMTsNGyHkJel8x05OtgReL0izcC6pyfY=; b=kuR7+eKjJCGJkEOIL+Bd/aaoSAXG7MviLXlU8U6erSkimUsxHQfS+gkJQkWWkOVrPb nK4si6LuvfR03u/ywks5D070Q5PUFQg7ujCX5i6gPYz7fBDHikU4BhukSCu2yP1vSvPZ hOkW44UKhA+Al5G8l3yD2km4yd3gPAQJstRCBQlipNyLROBoI1nw+CKtvP0ITYbJ2uNF uotdX4CKQ2AurUcL1w30CxpaHgEHKdoj/1lKo96Mee9U9iORRJ31rmRWUUG+ngwnJlLl 0/ERcD6Vv/mdG5oTarIVEyOGKNgqHUPa/6pgcZgFkHAECRwPcGrKQTQUrXzgtEhbnueP sycw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q3-v6si3464618plb.824.2018.03.01.11.51.44; Thu, 01 Mar 2018 11:51:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161023AbeCATu2 (ORCPT + 99 others); Thu, 1 Mar 2018 14:50:28 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43644 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033307AbeCATqk (ORCPT ); Thu, 1 Mar 2018 14:46:40 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D13F040744C6; Thu, 1 Mar 2018 19:46:39 +0000 (UTC) Received: from madcap2.tricolour.ca (ovpn-112-12.rdu2.redhat.com [10.10.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA0139C079; Thu, 1 Mar 2018 19:46:36 +0000 (UTC) From: Richard Guy Briggs To: cgroups@vger.kernel.org, containers@lists.linux-foundation.org, linux-api@vger.kernel.org, Linux-Audit Mailing List , linux-fsdevel@vger.kernel.org, LKML , 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 Subject: [RFC PATCH V1 04/12] audit: read container ID of a process Date: Thu, 1 Mar 2018 14:41:07 -0500 Message-Id: <7b1511e27c3239c2d356044fe1acca1375fd9233.1519930146.git.rgb@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 01 Mar 2018 19:46:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 01 Mar 2018 19:46:39 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'rgb@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for reading the container ID from the proc filesystem. This is a read from the proc entry of the form /proc/PID/containerid where PID is the process ID of the task whose container ID is sought. The read expects up to a u64 value (unset: 18446744073709551615). Signed-off-by: Richard Guy Briggs --- fs/proc/base.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 6ce4fbe..f66d1e2 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1300,6 +1300,21 @@ static ssize_t proc_sessionid_read(struct file * file, char __user * buf, .llseek = generic_file_llseek, }; +static ssize_t proc_containerid_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*2]; + + if (!task) + return -ESRCH; + length = scnprintf(tmpbuf, TMPBUFLEN*2, "%llu", audit_get_containerid(task)); + put_task_struct(task); + return simple_read_from_buffer(buf, count, ppos, tmpbuf, length); +} + static ssize_t proc_containerid_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -1330,6 +1345,7 @@ static ssize_t proc_containerid_write(struct file *file, const char __user *buf, } static const struct file_operations proc_containerid_operations = { + .read = proc_containerid_read, .write = proc_containerid_write, .llseek = generic_file_llseek, }; @@ -2996,7 +3012,7 @@ static int proc_pid_patch_state(struct seq_file *m, struct pid_namespace *ns, #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("containerid", S_IWUSR, proc_containerid_operations), + REG("containerid", S_IWUSR|S_IRUSR, proc_containerid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), @@ -3391,7 +3407,7 @@ static int proc_tid_comm_permission(struct inode *inode, int mask) #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), - REG("containerid", S_IWUSR, proc_containerid_operations), + REG("containerid", S_IWUSR|S_IRUSR, proc_containerid_operations), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations), -- 1.8.3.1