Received: by 2002:ac0:a874:0:0:0:0:0 with SMTP id c49csp680017ima; Fri, 15 Mar 2019 11:35:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqypgKckKuFvva28EQGLP4zYyKeo5C0899LdygRuS0n5ivgOJa2PiztZJU1LuYiHK9QQqiqQ X-Received: by 2002:a17:902:b086:: with SMTP id p6mr4144337plr.208.1552674916353; Fri, 15 Mar 2019 11:35:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552674916; cv=none; d=google.com; s=arc-20160816; b=GpaVq0vuuH+v86IPA5XzBUk00wQ9r2aDXy3BA+WH3bWy+uajr163D/dOA+oRsK1G6C IOyoIDJqk3MBWHHi+ZY6O8ah+w7NJ5weySfAX0wq/CNhTAX+NHqTzwzKVk45HaQtuJB9 lC9u0kpC4laMV0JEZiFRxXlbZfuz+zuzFt06roeqhoKZEVi2+t8SJ78F7VLOQriu3ecU emqNmviR8yagzR957LU9/PSn3lritQgbuvyBf+OxvBKEexraTszNcsZxtg6HkYOi970L aLeDBwinEEXY/Y1VHYuEnl0UXjcJR1dx8HBrxPOzXteTJEbpsircXYzEi7G+ImzRo/fE MP3A== 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; bh=ZpQoWnae1R4juaO0caQNWZA/oJ52MeEKbmFeb7Ya7nw=; b=KKFBx3bGylp7kEAhc6Ol9Pk2KJO1Qlprn432VGYQ0csEtTYzsX0lrAI4hc84+5vx49 4GLyRspYeSDrdKkf8DEVj8Y44da5GBk+cN30YPrNBbCCChyf8kZGv4Bdnh3FvfRiosZW IX8SKI/SPA6ry4ddw5/Dkd05m0H11682nyO+O/dq3PIRRYTrmueBo/3QutzdIQqT8kh0 RP5TAnTl464xVHq/bIMjhjEgKSmOlZN0SmyCGsRaRLkIFoalnE52BHqoagEjIlxgVwLR LlcyRXzF36b8CFu0W2/F3He3bAq3u/jZSnOpsO9lY3FZmICzQ7bBxey4Cy2MzdzG6u/E TJXw== 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 g25si2439307pfi.40.2019.03.15.11.35.01; Fri, 15 Mar 2019 11:35:16 -0700 (PDT) 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 S1726897AbfCOSdy (ORCPT + 99 others); Fri, 15 Mar 2019 14:33:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57926 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbfCOSdy (ORCPT ); Fri, 15 Mar 2019 14:33:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B8C19306D327; Fri, 15 Mar 2019 18:33:52 +0000 (UTC) Received: from madcap2.tricolour.ca (ovpn-112-22.phx2.redhat.com [10.3.112.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26B6451723; Fri, 15 Mar 2019 18:33:37 +0000 (UTC) From: Richard Guy Briggs To: containers@lists.linux-foundation.org, linux-api@vger.kernel.org, Linux-Audit Mailing List , linux-fsdevel@vger.kernel.org, LKML , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: Paul Moore , sgrubb@redhat.com, omosnace@redhat.com, dhowells@redhat.com, simo@redhat.com, eparis@parisplace.org, serge@hallyn.com, ebiederm@xmission.com, nhorman@tuxdriver.com, Richard Guy Briggs Subject: [PATCH ghak90 V5 03/10] audit: read container ID of a process Date: Fri, 15 Mar 2019 14:29:51 -0400 Message-Id: <25543e3db4d8f3853119f92c09a60664555249a2.1552665316.git.rgb@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 15 Mar 2019 18:33:53 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Serge Hallyn --- fs/proc/base.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 2505c46c8701..0b833cbdf5b6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1295,6 +1295,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*2]; + + if (!task) + return -ESRCH; + /* if we don't have caps, reject */ + if (!capable(CAP_AUDIT_CONTROL)) + return -EPERM; + length = scnprintf(tmpbuf, TMPBUFLEN*2, "%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) { @@ -1325,6 +1343,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, }; @@ -3039,7 +3058,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), @@ -3428,7 +3447,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