Received: by 10.213.65.68 with SMTP id h4csp261248imn; Fri, 16 Mar 2018 02:11:08 -0700 (PDT) X-Google-Smtp-Source: AG47ELsrsJAox9YSlAYuYlzZkNmUvUzSljrz58vWR2fNU7EWp5KAsd9xga7euj4d/v4ojJWFKzeu X-Received: by 2002:a17:902:b2c6:: with SMTP id x6-v6mr1329035plw.298.1521191468795; Fri, 16 Mar 2018 02:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521191468; cv=none; d=google.com; s=arc-20160816; b=NLE7n+sLcJaFlPvx/CvCsnbLxpzJaH+nrYcIrdIzvytrj7FecjjpFL6sKBJND3ocSQ ORTPJtXZTepfZX5CCzFRKnwdYUQBgCnXxEZL2bRP8iIgJLCvjV0AzvZrJvTTOjPHbOMK 0S4TDJXnNG9VzSQwP6iJprVEFDmW5X0iZT4N6BW45SPCFEwtCVRJ8haTh0E61Z8ihMkt OoKRqGj5xVmcr/lmgzeYiquNslc3yVfP6io1heQXaR1/ZBVeEnabvo9M1eOPV1OhSoHV EH7sSwZKpS7wNfYYfqQWAna3EMvedE7ULvnx2p4pKbGy0X3N9ACnCo39PqX5o8+raVDl r4ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=1zgXMrOVzEB6YwSHHz6S0ThmHpSyy2JHfcc5HDwdWwQ=; b=p3yFgseesavdgD4V6rKJ5nML32iettliD+Vl+j/OeH/BhPspC0r0cFrTBe+xf3RDWk 7JiSvXmlAL4BLuQByw792AY5wXo7Xd7AFVPPu2RYn+bi74ebkFdJCCJiXa3h/mJHTA3S cQcCn967XveLf5YHQECR4C4Nf4LI/LZjVa8xB0ONOwQxBamVJw1ssQaouaVWH+SYa9dd 83TLlzJmYTNa5jf7nCleiN2x8X0e84QmXZATmLDI4mFjMfYdruD2P4JkeOnHW5r50XXM 6a8ZxhxUp1WCwo3hrRNhlICTl7SzHVQu+iy4aIjRzlsbtpSd7UK2KL3QsN1WG2LUWvSr 1pgQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (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 v5si2740489pgr.798.2018.03.16.02.10.54; Fri, 16 Mar 2018 02:11:08 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753382AbeCPJGs (ORCPT + 99 others); Fri, 16 Mar 2018 05:06:48 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45076 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751724AbeCPJGp (ORCPT ); Fri, 16 Mar 2018 05:06:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 144A78185338; Fri, 16 Mar 2018 09:06:45 +0000 (UTC) Received: from madcap2.tricolour.ca (ovpn-112-12.rdu2.redhat.com [10.10.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B59610B0089; Fri, 16 Mar 2018 09:06:33 +0000 (UTC) From: Richard Guy Briggs To: cgroups@vger.kernel.org, containers@lists.linux-foundation.org, linux-api@vger.kernel.org, Linux-Audit Mailing List , linux-fsdevel@vger.kernel.org, LKML , netdev@vger.kernel.org Cc: luto@kernel.org, jlayton@redhat.com, carlos@redhat.com, viro@zeniv.linux.org.uk, dhowells@redhat.com, simo@redhat.com, eparis@parisplace.org, serge@hallyn.com, ebiederm@xmission.com, madzcar@gmail.com, Richard Guy Briggs Subject: [RFC PATCH ghak32 V2 06/13] audit: add support for non-syscall auxiliary records Date: Fri, 16 Mar 2018 05:00:33 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 16 Mar 2018 09:06:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 16 Mar 2018 09:06:45 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'rgb@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Standalone audit records have the timestamp and serial number generated on the fly and as such are unique, making them standalone. This new function audit_alloc_local() generates a local audit context that will be used only for a standalone record and its auxiliary record(s). The context is discarded immediately after the local associated records are produced. Signed-off-by: Richard Guy Briggs --- include/linux/audit.h | 8 ++++++++ kernel/auditsc.c | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index ed16bb6..c0b83cb 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -227,7 +227,9 @@ static inline int audit_log_container_info(struct audit_context *context, /* These are defined in auditsc.c */ /* Public API */ extern int audit_alloc(struct task_struct *task); +extern struct audit_context *audit_alloc_local(void); extern void __audit_free(struct task_struct *task); +extern void audit_free_context(struct audit_context *context); extern void __audit_syscall_entry(int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); extern void __audit_syscall_exit(int ret_success, long ret_value); @@ -472,6 +474,12 @@ static inline int audit_alloc(struct task_struct *task) { return 0; } +static inline struct audit_context *audit_alloc_local(void) +{ + return NULL; +} +static inline void audit_free_context(struct audit_context *context) +{ } static inline void audit_free(struct task_struct *task) { } static inline void audit_syscall_entry(int major, unsigned long a0, diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 2932ef1..7103d23 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -959,8 +959,26 @@ int audit_alloc(struct task_struct *tsk) return 0; } -static inline void audit_free_context(struct audit_context *context) +struct audit_context *audit_alloc_local(void) { + struct audit_context *context; + + if (!audit_ever_enabled) + return NULL; /* Return if not auditing. */ + + context = audit_alloc_context(AUDIT_RECORD_CONTEXT); + if (!context) + return NULL; + context->serial = audit_serial(); + context->ctime = current_kernel_time64(); + context->in_syscall = 1; + return context; +} + +inline void audit_free_context(struct audit_context *context) +{ + if (!context) + return; audit_free_names(context); unroll_tree_refs(context, NULL, 0); free_tree_refs(context); -- 1.8.3.1