From patchwork Thu Mar 1 19:41:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Guy Briggs X-Patchwork-Id: 10252367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4773B6037D for ; Thu, 1 Mar 2018 19:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B62256E6 for ; Thu, 1 Mar 2018 19:47:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29E8826E69; Thu, 1 Mar 2018 19:47:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE0C8256E6 for ; Thu, 1 Mar 2018 19:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033996AbeCATre (ORCPT ); Thu, 1 Mar 2018 14:47:34 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46820 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033812AbeCATrc (ORCPT ); Thu, 1 Mar 2018 14:47:32 -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 5BF418D6FC; Thu, 1 Mar 2018 19:47:31 +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 3CCD99C070; Thu, 1 Mar 2018 19:47:20 +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 12/12] debug! audit: add container id Date: Thu, 1 Mar 2018 14:41:15 -0500 Message-Id: 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.2]); Thu, 01 Mar 2018 19:47:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 01 Mar 2018 19:47:31 +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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }