From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46513ECDE43 for ; Fri, 19 Oct 2018 19:41:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD0402086E for ; Fri, 19 Oct 2018 19:41:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore-com.20150623.gappssmtp.com header.i=@paul-moore-com.20150623.gappssmtp.com header.b="K6YVZLVV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD0402086E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=paul-moore.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728049AbeJTDsc (ORCPT ); Fri, 19 Oct 2018 23:48:32 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:46667 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727754AbeJTDsc (ORCPT ); Fri, 19 Oct 2018 23:48:32 -0400 Received: by mail-lj1-f194.google.com with SMTP id x3-v6so31810162lji.13 for ; Fri, 19 Oct 2018 12:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=e+UIjZU4x78PppO625JubbO1tzzTtqfCgYkpVOWoJmY=; b=K6YVZLVVaSeqVChXm24X4RLtZfst4X8RocGtQ0sGNYelsnm9lpwc4BOBhAWSi/bsQw sbiitOlSMCpJSv9yiQe8CPtpFWcLkUvIspSREdTv/LelS2ljl+oHMatX+hl930UmwH/L dVEY8RhA/NfrCi20fea+W5/PyxeNARqGFyut1d5l0wAoQgrKDXlzDrhV0AxwCH5yv/M9 6SZI6w+i7C/ZRDxYtYt3OA/bOZDkHrdxIUg5Z77FimYRhgNDvmoZHD5ra2cUvtDnwUrh UGSH7+jQoMxyNtKXjGcUh/oap9k+3UznGyisa8Q98E+uv1RjVhG/vSFaZktRMO6Oip+b mVjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=e+UIjZU4x78PppO625JubbO1tzzTtqfCgYkpVOWoJmY=; b=IALPo/POZKxTYCjNzXQkjKVqiMlHOK+/qAyDou3J2IQ5ETc4fsqck6PR6tvV+bwPzw Y12fLuvTBJjV1PxVfKmHI0yzZ4BIw3WQhWqxFbcBMz1rCyW1a/NU0iF1RM1CEmUWSN9j DxF/ZYUy8n7vE9t+UK0qh7xWYKV0j99aMJAJqufNRtgpkN4pFBv/cs+0pWTMhZjY931Y kLlNaQsIqOOp9Aj7WnG6ASMi9gCZophOoJtEcmmVh6LijDWi8yALlzT5IWMcbJusAC/Q fy/50P/62sZLgDq3rzk1x1rCIAKZp/XKM89ueCG9zo08qg1h+NTWDGbd1sswdoWCgKEb f7Jg== X-Gm-Message-State: AGRZ1gJ1MrW/j15m95rvkRBY3b+7U4r7M5ujJOXibenKYGiuHOuFLJno Cblj4UbSukuM5TWF/XWtLJutXqYbEfuavZoik6ei X-Google-Smtp-Source: ACcGV61FBnY3J1zPtOAVF8g6dKLjGiv66yLnxwIBmJZL9zlgZVoL9wKi1cwX40t7FVE2AFR30IXrDGOyPxcs3DZMOAY= X-Received: by 2002:a2e:4b11:: with SMTP id y17-v6mr2299193lja.42.1539978060547; Fri, 19 Oct 2018 12:41:00 -0700 (PDT) MIME-Version: 1.0 References: <12396e378a78ee8dd38c75f7730d67d8fbb08e02.1533065887.git.rgb@redhat.com> In-Reply-To: From: Paul Moore Date: Fri, 19 Oct 2018 15:40:49 -0400 Message-ID: Subject: Re: [PATCH ghak90 (was ghak32) V4 02/10] audit: add container id To: rgb@redhat.com Cc: containers@lists.linux-foundation.org, linux-api@vger.kernel.org, linux-audit@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, ebiederm@xmission.com, luto@kernel.org, carlos@redhat.com, dhowells@redhat.com, viro@zeniv.linux.org.uk, simo@redhat.com, Eric Paris , Serge Hallyn Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ooops, I hit send prematurely on this :/ My comments below should stand, but for things like this I usually try to get through the entire patchset before sending my comments as later patches can affect my comments on the earlier patches. On Fri, Oct 19, 2018 at 3:38 PM Paul Moore wrote: > On Tue, Jul 31, 2018 at 4:11 PM Richard Guy Briggs wrote= : > > > > Implement the proc fs write to set the audit container identifier of a > > process, emitting an AUDIT_CONTAINER_OP record to document the event. > > > > This is a write from the container orchestrator task to a proc entry of > > the form /proc/PID/audit_containerid where PID is the process ID of the > > newly created task that is to become the first task in a container, or > > an additional task added to a container. > > > > The write expects up to a u64 value (unset: 18446744073709551615). > > > > The writer must have capability CAP_AUDIT_CONTROL. > > > > This will produce a record such as this: > > type=3DCONTAINER_ID msg=3Daudit(2018-06-06 12:39:29.636:26949) : op= =3Dset opid=3D2209 old-contid=3D18446744073709551615 contid=3D123456 pid=3D= 628 auid=3Droot uid=3Droot tty=3DttyS0 ses=3D1 subj=3Dunconfined_u:unconfin= ed_r:unconfined_t:s0-s0:c0.c1023 comm=3Dbash exe=3D/usr/bin/bash res=3Dyes > > You need to update the record type in the example above. > > > The "op" field indicates an initial set. The "pid" to "ses" fields are > > the orchestrator while the "opid" field is the object's PID, the proces= s > > being "contained". Old and new audit container identifier values are > > given in the "contid" fields, while res indicates its success. > > I understand Steve's concern around the "op" field, but I think it > might be a bit premature to think we might not need to do some sort of > audit container ID management in the future that would want to make > use of the CONTAINER_OP message type. I would like to see the "op" > field preserved. > > > It is not permitted to unset the audit container identifier. > > A child inherits its parent's audit container identifier. > > > > See: https://github.com/linux-audit/audit-kernel/issues/90 > > See: https://github.com/linux-audit/audit-userspace/issues/51 > > See: https://github.com/linux-audit/audit-testsuite/issues/64 > > See: https://github.com/linux-audit/audit-kernel/wiki/RFE-Audit-Contain= er-ID > > > > Signed-off-by: Richard Guy Briggs > > Acked-by: Serge Hallyn > > Acked-by: Steve Grubb > > --- > > fs/proc/base.c | 37 +++++++++++++++++++++++++ > > include/linux/audit.h | 24 ++++++++++++++++ > > include/uapi/linux/audit.h | 2 ++ > > kernel/auditsc.c | 68 ++++++++++++++++++++++++++++++++++++++= ++++++++ > > 4 files changed, 131 insertions(+) > > ... > > > @@ -2112,6 +2114,72 @@ int audit_set_loginuid(kuid_t loginuid) > > } > > > > /** > > + * audit_set_contid - set current task's audit_context contid > > + * @contid: contid value > > + * > > + * Returns 0 on success, -EPERM on permission failure. > > + * > > + * Called (set) from fs/proc/base.c::proc_contid_write(). > > + */ > > +int audit_set_contid(struct task_struct *task, u64 contid) > > +{ > > + u64 oldcontid; > > + int rc =3D 0; > > + struct audit_buffer *ab; > > + uid_t uid; > > + struct tty_struct *tty; > > + char comm[sizeof(current->comm)]; > > + > > + task_lock(task); > > + /* Can't set if audit disabled */ > > + if (!task->audit) { > > + task_unlock(task); > > + return -ENOPROTOOPT; > > + } > > + oldcontid =3D audit_get_contid(task); > > + read_lock(&tasklist_lock); > > I assume lockdep was happy with nesting the tasklist_lock inside the task= lock? > > > + /* Don't allow the audit containerid to be unset */ > > + if (!audit_contid_valid(contid)) > > + rc =3D -EINVAL; > > + /* if we don't have caps, reject */ > > + else if (!capable(CAP_AUDIT_CONTROL)) > > + rc =3D -EPERM; > > + /* if task has children or is not single-threaded, deny */ > > + else if (!list_empty(&task->children)) > > + rc =3D -EBUSY; > > + else if (!(thread_group_leader(task) && thread_group_empty(task= ))) > > + rc =3D -EALREADY; > > + read_unlock(&tasklist_lock); > > + if (!rc) > > + task->audit->contid =3D contid; > > + task_unlock(task); > > + > > + if (!audit_enabled) > > + return rc; > > + > > + ab =3D audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONTA= INER_OP); > > + if (!ab) > > + return rc; > > + > > + uid =3D from_kuid(&init_user_ns, task_uid(current)); > > + tty =3D audit_get_tty(current); > > + audit_log_format(ab, "op=3Dset opid=3D%d old-contid=3D%llu cont= id=3D%llu pid=3D%d uid=3D%u auid=3D%u tty=3D%s ses=3D%u", > > + task_tgid_nr(task), oldcontid, contid, > > + task_tgid_nr(current), uid, > > + from_kuid(&init_user_ns, audit_get_loginuid(cu= rrent)), > > + tty ? tty_name(tty) : "(none)", > > + audit_get_sessionid(current)); > > + audit_put_tty(tty); > > + audit_log_task_context(ab); > > + audit_log_format(ab, " comm=3D"); > > + audit_log_untrustedstring(ab, get_task_comm(comm, current)); > > + audit_log_d_path_exe(ab, current->mm); > > + audit_log_format(ab, " res=3D%d", !rc); > > + audit_log_end(ab); > > + return rc; > > +} > > -- > paul moore > www.paul-moore.com --=20 paul moore www.paul-moore.com