On 2018-04-18 20:42, Paul Moore wrote:

On Fri, Mar 16, 2018 at 5:00 AM, Richard Guy Briggs [off-list ref] wrote:

quoted

Add container ID auxiliary record to mark, watch and tree rule
configuration standalone records.

Signed-off-by: Richard Guy Briggs <redacted>
---
 kernel/audit_fsnotify.c |  5 ++++-
 kernel/audit_tree.c     |  5 ++++-
 kernel/audit_watch.c    | 33 +++++++++++++++++++--------------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index 52f368b..18c110d 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c

@@ -124,10 +124,11 @@ static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, c
 {
        struct audit_buffer *ab;
        struct audit_krule *rule = audit_mark->rule;
+       struct audit_context *context = audit_alloc_local();

        if (!audit_enabled)
                return;

Move the audit_alloc_local() after the audit_enabled check.

Already fixed in V3 as previously warned, by making all
AUDIT_CONFIG_CHANGE records SYSCALL auxiliary records.

quoted

-       ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);
+       ab = audit_log_start(context, GFP_NOFS, AUDIT_CONFIG_CHANGE);
        if (unlikely(!ab))
                return;
        audit_log_format(ab, "auid=%u ses=%u op=%s",

@@ -138,6 +139,8 @@ static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, c
        audit_log_key(ab, rule->filterkey);
        audit_log_format(ab, " list=%d res=1", rule->listnr);
        audit_log_end(ab);
+       audit_log_container_info(context, "config", audit_get_containerid(current));
+       audit_free_context(context);
 }

 void audit_remove_mark(struct audit_fsnotify_mark *audit_mark)

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 67e6956..7c085be 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c

@@ -496,8 +496,9 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
 static void audit_tree_log_remove_rule(struct audit_krule *rule)
 {
        struct audit_buffer *ab;
+       struct audit_context *context = audit_alloc_local();

Sort of independent of the audit container ID work, but shouldn't we
have an audit_enabled check here?

Same.

quoted

-       ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
+       ab = audit_log_start(context, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
        if (unlikely(!ab))
                return;
        audit_log_format(ab, "op=remove_rule");

@@ -506,6 +507,8 @@ static void audit_tree_log_remove_rule(struct audit_krule *rule)
        audit_log_key(ab, rule->filterkey);
        audit_log_format(ab, " list=%d res=1", rule->listnr);
        audit_log_end(ab);
+       audit_log_container_info(context, "config", audit_get_containerid(current));
+       audit_free_context(context);
 }

 static void kill_rules(struct audit_tree *tree)

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 9eb8b35..60d75a2 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c

@@ -238,20 +238,25 @@ static struct audit_watch *audit_dupe_watch(struct audit_watch *old)

 static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watch *w, char *op)
 {
-       if (audit_enabled) {
-               struct audit_buffer *ab;
-               ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);
-               if (unlikely(!ab))
-                       return;
-               audit_log_format(ab, "auid=%u ses=%u op=%s",
-                                from_kuid(&init_user_ns, audit_get_loginuid(current)),
-                                audit_get_sessionid(current), op);
-               audit_log_format(ab, " path=");
-               audit_log_untrustedstring(ab, w->path);
-               audit_log_key(ab, r->filterkey);
-               audit_log_format(ab, " list=%d res=1", r->listnr);
-               audit_log_end(ab);
-       }
+       struct audit_buffer *ab;
+       struct audit_context *context = audit_alloc_local();
+
+       if (!audit_enabled)
+               return;

Same as above, do the allocation after the audit_enabled check.

Same.

quoted

+       ab = audit_log_start(context, GFP_NOFS, AUDIT_CONFIG_CHANGE);
+       if (unlikely(!ab))
+               return;
+       audit_log_format(ab, "auid=%u ses=%u op=%s",
+                        from_kuid(&init_user_ns, audit_get_loginuid(current)),
+                        audit_get_sessionid(current), op);
+       audit_log_format(ab, " path=");
+       audit_log_untrustedstring(ab, w->path);
+       audit_log_key(ab, r->filterkey);
+       audit_log_format(ab, " list=%d res=1", r->listnr);
+       audit_log_end(ab);
+       audit_log_container_info(context, "config", audit_get_containerid(current));
+       audit_free_context(context);
 }

-- 
paul moore
www.paul-moore.com

- RGB

--
Richard Guy Briggs [off-list ref]
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