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=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 5A270C28CC3 for ; Thu, 30 May 2019 13:08:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 384E525952 for ; Thu, 30 May 2019 13:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726925AbfE3NIT convert rfc822-to-8bit (ORCPT ); Thu, 30 May 2019 09:08:19 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:35761 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726743AbfE3NIT (ORCPT ); Thu, 30 May 2019 09:08:19 -0400 Received: by mail-oi1-f194.google.com with SMTP id y6so1246689oix.2 for ; Thu, 30 May 2019 06:08:18 -0700 (PDT) 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=qS3Q/hz5cO93oEIRYjaW7Sr8hav+cFNgiudkzNoMj8w=; b=LvWGzlMGYRRjRdPHvITbAqL4TUkeRndCXuAogq06cn7jmeCKu+x2YhopKLsc9g4PQK PR2pKSxqA49V1aZivEyVe5ly4ecdB1373u9XK3rqTmdxqa8wDEn6hTfWcinGrcWHef+y GpzUfRMkTqfugyAF6gher6vXO0NVKmbE3uDKtoizcLaLX3myUsTpd4O4SUHl/ngOE6Wu pZWmbjsUhq+eQO+9Wka7xYVVsyUR8tRJIoZEqdtfB+XFPxnapIcZSGwuZlBdvpc/dKg3 CdJU+h1tp7yXMimSfZBScUILI43cabpvbQQ+p7Vz/lW0lcvPHAdpPSKeHhgWxMyZC4it O/4Q== X-Gm-Message-State: APjAAAXyPtUv71PWfKRPUu5HyyQruzXcB0oBt6xWAAetDsnpLO2UzFtY L16HzYsP+HLdRxbS+16H3JkgfdIURWmdUn0UeLCgYQ== X-Google-Smtp-Source: APXvYqxRNQdu8FXZJDPynHtWRxoDcqnlrWbPcgP874hkqSkQlayP5hnOUfRLSzP0TLiIV+sPYeCjXTJG6BZ8bL0SPWw= X-Received: by 2002:aca:300d:: with SMTP id w13mr2391467oiw.26.1559221697952; Thu, 30 May 2019 06:08:17 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ondrej Mosnacek Date: Thu, 30 May 2019 15:08:07 +0200 Message-ID: Subject: Re: [PATCH ghak90 V6 04/10] audit: log container info of syscalls To: Paul Moore Cc: Richard Guy Briggs , 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, Steve Grubb , David Howells , Simo Sorce , Eric Paris , Serge Hallyn , "Eric W . Biederman" , Neil Horman Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Thu, May 30, 2019 at 12:16 AM Paul Moore wrote: > On Mon, Apr 8, 2019 at 11:40 PM Richard Guy Briggs wrote: > > > > Create a new audit record AUDIT_CONTAINER_ID to document the audit > > container identifier of a process if it is present. > > > > Called from audit_log_exit(), syscalls are covered. > > > > A sample raw event: > > type=SYSCALL msg=audit(1519924845.499:257): arch=c000003e syscall=257 success=yes exit=3 a0=ffffff9c a1=56374e1cef30 a2=241 a3=1b6 items=2 ppid=606 pid=635 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=pts0 ses=3 comm="bash" exe="/usr/bin/bash" subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 key="tmpcontainerid" > > type=CWD msg=audit(1519924845.499:257): cwd="/root" > > type=PATH msg=audit(1519924845.499:257): item=0 name="/tmp/" inode=13863 dev=00:27 mode=041777 ouid=0 ogid=0 rdev=00:00 obj=system_u:object_r:tmp_t:s0 nametype= PARENT cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 > > type=PATH msg=audit(1519924845.499:257): item=1 name="/tmp/tmpcontainerid" inode=17729 dev=00:27 mode=0100644 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=CREATE cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 > > type=PROCTITLE msg=audit(1519924845.499:257): proctitle=62617368002D6300736C65657020313B206563686F2074657374203E202F746D702F746D70636F6E7461696E65726964 > > type=CONTAINER_ID msg=audit(1519924845.499:257): contid=123458 > > > > Please see the github audit kernel issue for the main feature: > > https://github.com/linux-audit/audit-kernel/issues/90 > > Please see the github audit userspace issue for supporting additions: > > https://github.com/linux-audit/audit-userspace/issues/51 > > Please see the github audit testsuiite issue for the test case: > > https://github.com/linux-audit/audit-testsuite/issues/64 > > Please see the github audit wiki for the feature overview: > > https://github.com/linux-audit/audit-kernel/wiki/RFE-Audit-Container-ID > > Signed-off-by: Richard Guy Briggs > > Acked-by: Serge Hallyn > > Acked-by: Steve Grubb > > Acked-by: Neil Horman > > Reviewed-by: Ondrej Mosnacek > > --- > > include/linux/audit.h | 5 +++++ > > include/uapi/linux/audit.h | 1 + > > kernel/audit.c | 20 ++++++++++++++++++++ > > kernel/auditsc.c | 20 ++++++++++++++------ > > 4 files changed, 40 insertions(+), 6 deletions(-) > > ... > > > diff --git a/kernel/audit.c b/kernel/audit.c > > index 182b0f2c183d..3e0af53f3c4d 100644 > > --- a/kernel/audit.c > > +++ b/kernel/audit.c > > @@ -2127,6 +2127,26 @@ void audit_log_session_info(struct audit_buffer *ab) > > audit_log_format(ab, "auid=%u ses=%u", auid, sessionid); > > } > > > > +/* > > + * audit_log_contid - report container info > > + * @context: task or local context for record > > + * @contid: container ID to report > > + */ > > +void audit_log_contid(struct audit_context *context, u64 contid) > > +{ > > + struct audit_buffer *ab; > > + > > + if (!audit_contid_valid(contid)) > > + return; > > + /* Generate AUDIT_CONTAINER_ID record with container ID */ > > + ab = audit_log_start(context, GFP_KERNEL, AUDIT_CONTAINER_ID); > > + if (!ab) > > + return; > > + audit_log_format(ab, "contid=%llu", (unsigned long long)contid); > > We have a consistency problem regarding how to output the u64 contid > values; this function uses an explicit cast, others do not. According > to Documentation/core-api/printk-formats.rst the recommendation for > u64 is %llu (or %llx, if you want hex). Looking quickly through the > printk code this appears to still be correct. I suggest we get rid of > the cast (like it was in v5). IIRC it was me who suggested to add the casts. I didn't realize that the kernel actually guarantees that "%llu" will always work with u64. Taking that into account I rescind my request to add the cast. Sorry for the false alarm. > > > + audit_log_end(ab); > > +} > > +EXPORT_SYMBOL(audit_log_contid); > > -- > paul moore > www.paul-moore.com -- Ondrej Mosnacek Software Engineer, Security Technologies Red Hat, Inc.