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=-12.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 9FA50C43387 for ; Thu, 3 Jan 2019 20:10:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61756208E3 for ; Thu, 3 Jan 2019 20:10:47 +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="0gWM1qCU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726914AbfACUKq (ORCPT ); Thu, 3 Jan 2019 15:10:46 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:37755 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726688AbfACUKp (ORCPT ); Thu, 3 Jan 2019 15:10:45 -0500 Received: by mail-lj1-f196.google.com with SMTP id t18-v6so30719447ljd.4 for ; Thu, 03 Jan 2019 12:10:43 -0800 (PST) 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; bh=z0Yjossshc4/KAwUVWK38uJ5MXVeqDGRfuaO8ILv0rk=; b=0gWM1qCU4dnP0oDRuP5X83oz+b3euRZ9bRg4PSEOHCVt7Lgp+7C8B7ujh1ZXOeYGsO smyVcA8RwxdeRhaOLVY52JtwvU7tI7oOtg1eP8/kgRFCuwwGSGgDs5sa8V/HpLw21M20 /6CcfAjRG2tNdbq3ckx56XDLPZDDXbwWcoVE86zwJleRTF2in1FuaNHzQuDGUFHPC4Wa GakuXM+jUn7AWEzC1pD+ttSRkFmpU7V1t1Qm6w/BixzwQijSBMFNssCo0ag4VuiO9qk4 bKcRJjDdu+KffiJ95qUzzk6141bMJbhM/7WgNPvtn0GFwbR6PqS0HOsVci/wo3TRZbiy k5zQ== 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; bh=z0Yjossshc4/KAwUVWK38uJ5MXVeqDGRfuaO8ILv0rk=; b=DLP6UF1veD6Bgkrkf3Kte56xVdELg2Wr81Ujgabo1XTxiveHwWcHaYCHPcuDXN0fmo RtwNGrVNT5Dq4eH6WAOTZxtgnxh0wqk7QOhcX8r8KjEFjZzFriIqNfoFTlSqEOlKLNI1 1APOHNQSOP/Z7nmO/KJoyctEhPMCtOnnICgbntrYKPrX/wp9fvqPJHNFpD/ZwG30dWii 30/nohHg1T0WSTbs83Wtryc4bT7j3Ce9gLm1V1C7Sg6soC8NBC1/g1IjpvbUOMq/2wtU IFvmm/ZpQDQ1NNuvnWmlpp69m8O005X4BcUEWgygu9G9it5+tRdflgPmU5NiXGH4KKIp KEbA== X-Gm-Message-State: AJcUukdqwYM6HeFTDv0dTv3Efle5JUINXAhBabTKM/BBtf+N4IHHaLYB ORNjH1R0VQy4p4CJXbJYwTU9mXn56L/LUFn1lzvb X-Google-Smtp-Source: ALg8bN4RIVAcrkAK/kPlUhOb06YbW3Z54mck3vagnDJT4tncPjppVpRomV55D0J7DoTtlLQa9K9pi8qCMhQgm5aEfzE= X-Received: by 2002:a2e:834a:: with SMTP id l10-v6mr6418289ljh.42.1546546242675; Thu, 03 Jan 2019 12:10:42 -0800 (PST) MIME-Version: 1.0 References: <8e617ab568df28a66dfbe3284452de186b42fb0f.1533065887.git.rgb@redhat.com> <20181101220724.ggkqyf5kjv7lhabx@madcap2.tricolour.ca> In-Reply-To: <20181101220724.ggkqyf5kjv7lhabx@madcap2.tricolour.ca> From: Paul Moore Date: Thu, 3 Jan 2019 15:10:31 -0500 Message-ID: Subject: Re: [PATCH ghak90 (was ghak32) V4 01/10] audit: collect audit task parameters To: Richard Guy Briggs Cc: containers@lists.linux-foundation.org, linux-api@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org, ebiederm@xmission.com, luto@kernel.org, dhowells@redhat.com, viro@zeniv.linux.org.uk, simo@redhat.com, Eric Paris , Serge Hallyn Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 1, 2018 at 6:07 PM Richard Guy Briggs wrote: > On 2018-10-19 19:15, Paul Moore wrote: > > On Sun, Aug 5, 2018 at 4:32 AM Richard Guy Briggs wrote: > > > The audit-related parameters in struct task_struct should ideally be > > > collected together and accessed through a standard audit API. > > > > > > Collect the existing loginuid, sessionid and audit_context together in a > > > new struct audit_task_info called "audit" in struct task_struct. > > > > > > Use kmem_cache to manage this pool of memory. > > > Un-inline audit_free() to be able to always recover that memory. > > > > > > See: https://github.com/linux-audit/audit-kernel/issues/81 > > > > > > Signed-off-by: Richard Guy Briggs > > > --- > > > include/linux/audit.h | 34 ++++++++++++++++++++++++---------- > > > include/linux/sched.h | 5 +---- > > > init/init_task.c | 3 +-- > > > init/main.c | 2 ++ > > > kernel/auditsc.c | 51 ++++++++++++++++++++++++++++++++++++++++++--------- > > > kernel/fork.c | 4 +++- > > > 6 files changed, 73 insertions(+), 26 deletions(-) > > > > ... > > > > > diff --git a/include/linux/sched.h b/include/linux/sched.h > > > index 87bf02d..e117272 100644 > > > --- a/include/linux/sched.h > > > +++ b/include/linux/sched.h > > > @@ -873,10 +872,8 @@ struct task_struct { > > > > > > struct callback_head *task_works; > > > > > > - struct audit_context *audit_context; > > > #ifdef CONFIG_AUDITSYSCALL > > > - kuid_t loginuid; > > > - unsigned int sessionid; > > > + struct audit_task_info *audit; > > > #endif > > > struct seccomp seccomp; > > > > Prior to this patch audit_context was available regardless of > > CONFIG_AUDITSYSCALL, after this patch the corresponding audit_context > > is only available when CONFIG_AUDITSYSCALL is defined. > > This was intentional since audit_context is not used when AUDITSYSCALL is > disabled. audit_alloc() was stubbed in that case to return 0. audit_context() > returned NULL. > > The fact that audit_context was still present in struct task_struct was an > oversight in the two patches already accepted: > ("audit: use inline function to get audit context") > ("audit: use inline function to get audit context") > that failed to hide or remove it from struct task_struct when it was no longer > relevant. Okay, in that case let's pull this out and fix this separately from the audit container ID patchset. > On further digging, loginuid and sessionid (and audit_log_session_info) should > be part of CONFIG_AUDIT scope and not CONFIG_AUDITSYSCALL since it is used in > CONFIG_CHANGE, ANOM_LINK, FEATURE_CHANGE(, INTEGRITY_RULE), none of which are > otherwise dependent on AUDITSYSCALL. This looks like something else we should fix independently from this patchset. > Looking ahead, contid should be treated like loginuid and sessionid, which are > currently only available when syscall auditting is. That seems reasonable. Eventually it would be great if we got rid of CONFIG_AUDITSYSCALL, but that is a separate issue, and something that is going to require work from the different arch/ABI folks to ensure everything is working properly. > Converting records from standalone to syscall and checking audit_dummy_context > changes the nature of CONFIG_AUDIT/!CONFIG_AUDITSYSCALL separation. > eg: ANOM_LINK accompanied by PATH record (which needed CWD addition to be > complete anyways) > > > > diff --git a/init/main.c b/init/main.c > > > index 3b4ada1..6aba171 100644 > > > --- a/init/main.c > > > +++ b/init/main.c > > > @@ -92,6 +92,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > > #include > > > #include > > > @@ -721,6 +722,7 @@ asmlinkage __visible void __init start_kernel(void) > > > nsfs_init(); > > > cpuset_init(); > > > cgroup_init(); > > > + audit_task_init(); > > > taskstats_init_early(); > > > delayacct_init(); > > > > It seems like we would need either init_struct_audit or > > audit_task_init(), but not both, yes? > > One sets initial values of init task via an included struct, other makes a call > to create the kmem cache. Both seem appropriate to me unless we move the > initialization from a struct to assignments in audit_task_init(), but I'm not > that comfortable separating the audit init values from the rest of the > task_struct init task initializers (though there are other subsystems that need > to do so dynamically). My original thinking was focused on the use of init_struct_audit as an initializer when audit_task_init() was already creating a kmem_cache pool and a zero'd/init'd audit_task_info could be obtained via the usual kmem_cache functions. Alternatively, although I don't believe it would be recommended for this case, would be to use init_struct_audit as an init helper if we included the audit_task_info struct directly in the task_struct, as opposed to a pointer. What I missed was the simple fact that you're only using init_struct_audit for the init_task, which pretty much makes my original question rather silly :) -- paul moore www.paul-moore.com