Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp935383ybh; Thu, 12 Mar 2020 13:52:51 -0700 (PDT) X-Google-Smtp-Source: ADFU+vupo43T7U/lea2IGZ+/YI6EYkUTgXKqWUwipHNLdk3QDbYdIVrSI4W5WcDDlIvQpKN2VS1P X-Received: by 2002:a9d:a51:: with SMTP id 75mr7850433otg.112.1584046371152; Thu, 12 Mar 2020 13:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584046371; cv=none; d=google.com; s=arc-20160816; b=BkQZq7nIvWXbSygOeg+L5Ie6OztJVEwMjppKHeTE4lPaHgEPrRv3BWEPQjL/9hxw7k 0n+M/5S6e1tv3u2Ou9w2YmSP+yle9ZpTf5N+xeDjIzwIVWctveUuBNlL29JB24klLrlX wOeImj8IAX1q481ZQvkHJwpwFtGA3CRjJSg38EFXhQlHQOOh+mmPZ7eO4tK/2NV+hRx/ kS7cgVkR5jcz8vE/Beu8kgy8Oj9T4KJNsNcD4XkvfO+O4S4ZezY4xo0c1TckC2F631vb oShrN5gARXz3xHj9+9y3B/NtLaghDPKlo4I8XUzQi9l1dKl238vKAOHQoa8lSspo5CI2 6l5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=B1s8axBbD56BcjKd6ubV/APLf4JXWWdJoFoqMQy3Vc8=; b=hO8qf+qO78A0LuLFOS4OLEJydKaL8ZU3FP3FYSLL2VttBZrvROrCW/00/WLhCPotpW PoIhSaF27oSFaYDya82eDMlMlQJFPbGLzDEkLCi0b4wYMHDzJiOrXVlMSXeCpKqMgSdC CCQ4t0CUGnpbC2z/O7nG91wa2ryXMzUeKHJqCSimpHT5j9aizRVz9wtNeqwWtr+gNmrV 3B91THTlVXbftBeV9BgPEV7dee6yeuI45Oys/GUB/cM5vwhSkolXkX8ij4DWzIgAwchI iXuC5lu3Gr4tE2Dh6aAPVEn3CckuGNsb1roW0JXtykZ4mbGytnnrf7LviXaw4q8hJNRm U+pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eqpuTY2C; 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=pass (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 c12si3351628otr.67.2020.03.12.13.52.38; Thu, 12 Mar 2020 13:52:51 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eqpuTY2C; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727061AbgCLUwL (ORCPT + 99 others); Thu, 12 Mar 2020 16:52:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52200 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726571AbgCLUwK (ORCPT ); Thu, 12 Mar 2020 16:52:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584046329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=B1s8axBbD56BcjKd6ubV/APLf4JXWWdJoFoqMQy3Vc8=; b=eqpuTY2Cd3kAOBi4mMeag0JC8wfa3RhDib+0oHHf2oKYSiV2+Qz4S4RgVt3N/yd5tJJjGN HjDHfd6ZfLR5LfL3BUyM0o9dpWobglbL9fN1kiKKyVUzFMsTgWDfc/hpCmmnT+DdyQ60wH 6FJLNli74fGp5AnFmmHOuR6ru6Sexyg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-CRQEcSVHNTiRduTD2FkvkQ-1; Thu, 12 Mar 2020 16:52:05 -0400 X-MC-Unique: CRQEcSVHNTiRduTD2FkvkQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C31E8017DF; Thu, 12 Mar 2020 20:52:02 +0000 (UTC) Received: from madcap2.tricolour.ca (ovpn-112-16.rdu2.redhat.com [10.10.112.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28FFE7388A; Thu, 12 Mar 2020 20:51:49 +0000 (UTC) Date: Thu, 12 Mar 2020 16:51:47 -0400 From: Richard Guy Briggs To: Paul Moore Cc: nhorman@tuxdriver.com, linux-api@vger.kernel.org, containers@lists.linux-foundation.org, LKML , dhowells@redhat.com, Linux-Audit Mailing List , netfilter-devel@vger.kernel.org, ebiederm@xmission.com, simo@redhat.com, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, Eric Paris , mpatel@redhat.com, Serge Hallyn Subject: Re: [PATCH ghak90 V8 13/16] audit: track container nesting Message-ID: <20200312205147.plxs4czjeuu4davj@madcap2.tricolour.ca> References: <6452955c1e038227a5cd169f689f3fd3db27513f.1577736799.git.rgb@redhat.com> <20200130192753.n7jjrshbhrczjzoe@madcap2.tricolour.ca> <20200205235056.e5365xtgz7rbese2@madcap2.tricolour.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-02-13 16:49, Paul Moore wrote: > On Wed, Feb 5, 2020 at 6:51 PM Richard Guy Briggs wrote: > > On 2020-02-05 18:05, Paul Moore wrote: > > > On Thu, Jan 30, 2020 at 2:28 PM Richard Guy Briggs wrote: > > > > On 2020-01-22 16:29, Paul Moore wrote: > > > > > On Tue, Dec 31, 2019 at 2:51 PM Richard Guy Briggs wrote: > > > > > > > > > > > > Track the parent container of a container to be able to filter and > > > > > > report nesting. > > > > > > > > > > > > Now that we have a way to track and check the parent container of a > > > > > > container, modify the contid field format to be able to report that > > > > > > nesting using a carrat ("^") separator to indicate nesting. The > > > > > > original field format was "contid=" for task-associated records > > > > > > and "contid=[,[...]]" for network-namespace-associated > > > > > > records. The new field format is > > > > > > "contid=[^[...]][,[...]]". > > > > > > > > > > Let's make sure we always use a comma as a separator, even when > > > > > recording the parent information, for example: > > > > > "contid=[,^[...]][,[...]]" > > > > > > > > The intent here is to clearly indicate and separate nesting from > > > > parallel use of several containers by one netns. If we do away with > > > > that distinction, then we lose that inheritance accountability and > > > > should really run the list through a "uniq" function to remove the > > > > produced redundancies. This clear inheritance is something Steve was > > > > looking for since tracking down individual events/records to show that > > > > inheritance was not aways feasible due to rolled logs or search effort. > > > > > > Perhaps my example wasn't clear. I'm not opposed to the little > > > carat/hat character indicating a container's parent, I just think it > > > would be good to also include a comma *in*addition* to the carat/hat. > > > > Ah, ok. Well, I'd offer that it would be slightly shorter, slightly > > less cluttered and having already written the parser in userspace, I > > think the parser would be slightly simpler. > > > > I must admit, I was a bit puzzled by your snippet of code that was used > > as a prefix to the next item rather than as a postfix to the given item. > > > > Can you say why you prefer the comma in addition? > > Generally speaking, I believe that a single delimiter is both easier > for the eyes to parse, and easier/safer for machines to parse as well. > In this particular case I think of the comma as a delimiter and the > carat as a modifier, reusing the carat as a delimiter seems like a bad > idea to me. I'm not crazy about this idea, but I'll have a look at how much work it is to recode the userspace search tools. It also adds extra characters and noise into the string format that seems counterproductive. > > > > > > diff --git a/kernel/audit.c b/kernel/audit.c > > > > > > index ef8e07524c46..68be59d1a89b 100644 > > > > > > --- a/kernel/audit.c > > > > > > +++ b/kernel/audit.c > > > > > > > > > > > @@ -492,6 +493,7 @@ void audit_switch_task_namespaces(struct nsproxy *ns, struct task_struct *p) > > > > > > audit_netns_contid_add(new->net_ns, contid); > > > > > > } > > > > > > > > > > > > +void audit_log_contid(struct audit_buffer *ab, u64 contid); > > > > > > > > > > If we need a forward declaration, might as well just move it up near > > > > > the top of the file with the rest of the declarations. > > > > > > > > Ok. > > > > > > > > > > +void audit_log_contid(struct audit_buffer *ab, u64 contid) > > > > > > +{ > > > > > > + struct audit_contobj *cont = NULL, *prcont = NULL; > > > > > > + int h; > > > > > > > > > > It seems safer to pass the audit container ID object and not the u64. > > > > > > > > It would also be faster, but in some places it isn't available such as > > > > for ptrace and signal targets. This also links back to the drop record > > > > refcounts to hold onto the contobj until process exit, or signal > > > > delivery. > > > > > > > > What we could do is to supply two potential parameters, a contobj and/or > > > > a contid, and have it use the contobj if it is valid, otherwise, use the > > > > contid, as is done for names and paths supplied to audit_log_name(). > > > > > > Let's not do multiple parameters, that begs for misuse, let's take the > > > wrapper function route: > > > > > > func a(int id) { > > > // important stuff > > > } > > > > > > func ao(struct obj) { > > > a(obj.id); > > > } > > > > > > ... and we can add a comment that you *really* should be using the > > > variant that passes an object. > > > > I was already doing that where it available, and dereferencing the id > > for the call. But I see an advantage to having both parameters supplied > > to the function, since it saves us the trouble of dereferencing it, > > searching for the id in the hash list and re-locating the object if the > > object is already available. > > I strongly prefer we not do multiple parameters for the same "thing"; So do I, ideally. However... > I would much rather do the wrapper approach as described above. I > would also like to see us use the audit container ID object as much as > possible, using a bare integer should be a last resort. It is not clear to me that you understood what I wrote above. I can't use the object pointer where preferable because there are a few cases where only the ID is available. If only the ID is available, I would have to make a best effort to look up the object pointer and am not guaranteed to find it (invalid, stale, signal info...). If I am forced to use only one, it becomes the ID that is used, and I no longer have the benefit of already having the object pointer for certainty and saving work. For all cases where I have the object pointer, which is most cases, and most frequently used cases, I will have to dereference the object pointer to an ID, then go through the work again to re-locate the object pointer. This is less certain, and more work. Reluctantly, the only practical solution I see here is to supply both, favouring the object pointer if it is valid, then falling back on the ID from the next parameter. > paul moore - RGB -- Richard Guy Briggs Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada IRC: rgb, SunRaycer Voice: +1.647.777.2635, Internal: (81) 32635