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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 3ECCEC433DF for ; Sat, 27 Jun 2020 15:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BFFD21655 for ; Sat, 27 Jun 2020 15:18:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I2De376v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726646AbgF0PS5 (ORCPT ); Sat, 27 Jun 2020 11:18:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34780 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725864AbgF0PS4 (ORCPT ); Sat, 27 Jun 2020 11:18:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593271135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=ZZ5FOOhnh8WeKo2UR8CepjovW3e3CFasEPI4df0kKF4=; b=I2De376vhGjPBD+wDNpA3oaiPZZQYoGc9B8ZKwutPG16Iy+FXkKl6ZaProM/cg6SYvRPnF J/6/nXCsm/+Fio+5kEjyYfmof3cacG9W5ZyyXWhdXtdkwcU4VIC5fGyVoU8HKZFurPDntH 60wB4g+CuCbN7Wb8udl/8vkPneySiCk= 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-232-OC7AD0qJNm-5SfTLrmYDkQ-1; Sat, 27 Jun 2020 11:18:51 -0400 X-MC-Unique: OC7AD0qJNm-5SfTLrmYDkQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D01F57092; Sat, 27 Jun 2020 15:18:47 +0000 (UTC) Received: from madcap2.tricolour.ca (unknown [10.10.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADDA860BF4; Sat, 27 Jun 2020 15:18:44 +0000 (UTC) From: Richard Guy Briggs To: containers@lists.linux-foundation.org, Linux-Audit Mailing List , LKML Cc: eparis@parisplace.org, Steve Grubb , omosnace@redhat.com, Paul Moore , nhorman@redhat.com, dwalsh@redhat.com, mpatel@redhat.com, Richard Guy Briggs Subject: [PATCH ghau51/ghau40 v9 01/11] AUDIT_CONTAINER_OP message type basic support Date: Sat, 27 Jun 2020 11:18:01 -0400 Message-Id: <1593271091-30188-2-git-send-email-rgb@redhat.com> In-Reply-To: <1593271091-30188-1-git-send-email-rgb@redhat.com> References: <1593271091-30188-1-git-send-email-rgb@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This defines the message number for the audit container identifier registration record should the kernel headers not be up to date, gives the record number a name for printing and allows the record to be interpreted since it is in the 1000 range like AUDIT_LOGIN. See: https://github.com/linux-audit/audit-userspace/issues/51 See: https://github.com/linux-audit/audit-kernel/issues/90 See: https://github.com/linux-audit/audit-testsuite/issues/64 See: https://github.com/linux-audit/audit-kernel/wiki/RFE-Audit-Container-ID Signed-off-by: Richard Guy Briggs --- lib/libaudit.h | 4 ++++ lib/msg_typetab.h | 1 + lib/netlink.c | 1 + src/ausearch-lol.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/lib/libaudit.h b/lib/libaudit.h index c3a8e4ddb65c..da7c61cc2e6d 100644 --- a/lib/libaudit.h +++ b/lib/libaudit.h @@ -246,6 +246,10 @@ extern "C" { #define AUDIT_GET_FEATURE 1019 /* Get which features are enabled */ #endif +#ifndef AUDIT_CONTAINER_OP +#define AUDIT_CONTAINER_OP 1020 /* Container creation notice */ +#endif + #ifndef AUDIT_MMAP #define AUDIT_MMAP 1323 /* Descriptor and flags in mmap */ #endif diff --git a/lib/msg_typetab.h b/lib/msg_typetab.h index 35127709c039..881f440c9d32 100644 --- a/lib/msg_typetab.h +++ b/lib/msg_typetab.h @@ -44,6 +44,7 @@ _S(AUDIT_LOGIN, "LOGIN" ) //_S(AUDIT_TTY_SET, "TTY_SET" ) //_S(AUDIT_SET_FEATURE, "SET_FEATURE" ) //_S(AUDIT_GET_FEATURE, "GET_FEATURE" ) +_S(AUDIT_CONTAINER_OP, "CONTAINER_OP" ) _S(AUDIT_USER_AUTH, "USER_AUTH" ) _S(AUDIT_USER_ACCT, "USER_ACCT" ) _S(AUDIT_USER_MGMT, "USER_MGMT" ) diff --git a/lib/netlink.c b/lib/netlink.c index 5b2028fda7e8..caa963b1ddb2 100644 --- a/lib/netlink.c +++ b/lib/netlink.c @@ -184,6 +184,7 @@ static int adjust_reply(struct audit_reply *rep, int len) break; case AUDIT_USER: case AUDIT_LOGIN: + case AUDIT_CONTAINER_OP: case AUDIT_KERNEL: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c index f0f36e04dd93..05fe80fe3ad6 100644 --- a/src/ausearch-lol.c +++ b/src/ausearch-lol.c @@ -248,6 +248,8 @@ static void check_events(lol *lo, time_t sec) ready++; } else if ( cur->l->e.type < AUDIT_LOGIN || (cur->l->e.type > AUDIT_LOGIN && + cur->l->e.type < AUDIT_CONTAINER_OP ) || + (cur->l->e.type > AUDIT_CONTAINER_OP && cur->l->e.type < AUDIT_FIRST_EVENT ) || cur->l->e.type == AUDIT_PROCTITLE || (cur->l->e.type >= AUDIT_MAC_UNLBL_ALLOW && -- 1.8.3.1