diff --git a/kernel/audit.c b/kernel/audit.c
index 5e150c6..ba304a8 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c

@@ -142,6 +142,7 @@ struct audit_net {
 kuid_t         audit_sig_uid = INVALID_UID;
 pid_t          audit_sig_pid = -1;
 u32            audit_sig_sid = 0;
+u64            audit_sig_cid = AUDIT_CID_UNSET;

 /* Records can be lost in several ways:
    0) [suppressed in audit_alloc]

@@ -1437,6 +1438,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                        memcpy(sig_data->ctx, ctx, len);
                        security_release_secctx(ctx, len);
                }
+               sig_data->cid = audit_sig_cid;
                audit_send_reply(skb, seq, AUDIT_SIGNAL_INFO, 0, 0,
                                 sig_data, sizeof(*sig_data) + len);
                kfree(sig_data);

@@ -2050,23 +2052,22 @@ void audit_log_session_info(struct audit_buffer *ab)

 /*
  * audit_log_contid - report container info
- * @tsk: task to be recorded
  * @context: task or local context for record
  * @op: contid string description
+ * @contid: container ID to report
  */
-int audit_log_contid(struct task_struct *tsk,
-                            struct audit_context *context, char *op)
+int audit_log_contid(struct audit_context *context,
+                             char *op, u64 contid)
 {
        struct audit_buffer *ab;

-       if (!audit_contid_set(tsk))
+       if (!cid_valid(contid))
                return 0;
        /* Generate AUDIT_CONTAINER record with container ID */
        ab = audit_log_start(context, GFP_KERNEL, AUDIT_CONTAINER);
        if (!ab)
                return -ENOMEM;
-       audit_log_format(ab, "op=%s contid=%llu",
-                        op, audit_get_contid(tsk));
+       audit_log_format(ab, "op=%s contid=%llu", op, contid);
        audit_log_end(ab);
        return 0;
 }