[PATCH ghak90 V5 07/10] audit: add containerid support for user records

[Richard Guy Briggs]

Add audit container identifier auxiliary record to user event standalone
records.

Signed-off-by: Richard Guy Briggs <r...@redhat.com>
---
 kernel/audit.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index cfa659b3f6c4..cf448599ef34 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1142,12 +1142,6 @@ static void audit_log_common_recv_msg(struct 
audit_context *context,
        audit_log_task_context(*ab);
 }
 
-static inline void audit_log_user_recv_msg(struct audit_buffer **ab,
-                                          u16 msg_type)
-{
-       audit_log_common_recv_msg(NULL, ab, msg_type);
-}
-
 int is_audit_feature_set(int i)
 {
        return af.features & AUDIT_FEATURE_TO_MASK(i);
@@ -1409,13 +1403,16 @@ static int audit_receive_msg(struct sk_buff *skb, 
struct nlmsghdr *nlh)
 
                err = audit_filter(msg_type, AUDIT_FILTER_USER);
                if (err == 1) { /* match or error */
+                       struct audit_context *context;
+
                        err = 0;
                        if (msg_type == AUDIT_USER_TTY) {
                                err = tty_audit_push();
                                if (err)
                                        break;
                        }
-                       audit_log_user_recv_msg(&ab, msg_type);
+                       context = audit_alloc_local(GFP_KERNEL);
+                       audit_log_common_recv_msg(context, &ab, msg_type);
                        if (msg_type != AUDIT_USER_TTY)
                                audit_log_format(ab, " msg='%.*s'",
                                                 AUDIT_MESSAGE_TEXT_MAX,
@@ -1431,6 +1428,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct 
nlmsghdr *nlh)
                                audit_log_n_untrustedstring(ab, data, size);
                        }
                        audit_log_end(ab);
+                       audit_log_contid(context, audit_get_contid(current));
+                       audit_free_context(context);
                }
                break;
        case AUDIT_ADD_RULE:
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit