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 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53EF7C07E9D for ; Tue, 27 Sep 2022 20:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664309559; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2HVrWtWhDZ9YhOWJJ9DpJFuBSrpuf8fsU390T6V/njw=; b=Li197N94t1jQLSb8oq9hnKeGNjftKV9MNgJ9Gla6GJtXcOYbgUlTYKJ8Co3MEPCYeYShQt v7f08RNYxDVmN/Lu75WAmieWCc5/sLbNvpDEN77rOVPmyt+ZmCvGZw/7azNkO+0G/vW9/f 5rCPfmfIdmFgD6I9qK4MSBLlYLtQ81Q= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-azuYqTZeMempKxOUkN8e_g-1; Tue, 27 Sep 2022 16:12:36 -0400 X-MC-Unique: azuYqTZeMempKxOUkN8e_g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 153503C0CD4C; Tue, 27 Sep 2022 20:12:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE2AAC15BA4; Tue, 27 Sep 2022 20:12:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B21C019465B1; Tue, 27 Sep 2022 20:12:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BD76A1946586 for ; Tue, 27 Sep 2022 20:12:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AA49D40C213F; Tue, 27 Sep 2022 20:12:33 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A335B40C2089 for ; Tue, 27 Sep 2022 20:12:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 861802999B33 for ; Tue, 27 Sep 2022 20:12:33 +0000 (UTC) Received: from sonic302-28.consmr.mail.ne1.yahoo.com (sonic302-28.consmr.mail.ne1.yahoo.com [66.163.186.154]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-593-3lvb40rhOo6HcFoabfOflA-1; Tue, 27 Sep 2022 16:12:29 -0400 X-MC-Unique: 3lvb40rhOo6HcFoabfOflA-1 X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1664309547; bh=GIQpcfsF3JbEQ9m2yt59Bvv8zj7/OX/JdjxEAfeQUZV=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=c5qBcqoIN108V5RO1EkD2vv2hZjNTvYSd+fALM1wZw1EFiwQhKrr/meIRv0kaBWT0rGZgpoq0p/H5vZimcQC46uwyBvBPoROnXaZC97os2J78jkNQRIGmMY/CDTxaxQTStiyK966BIQU3F+efoyHuc/zvqWVekUiz2WqJA4w+YPkDoU2pBrPIhvim521W9Bx8GpIIHt6NM1HnQb4ysA56j4xsWFMSwPxevtjxZVOE3vrPrgTteteC8CY+X1BFadEYoH0a/MQxBo+MD8+GKZPYKzz7D5BOHUbyX0yOrTNMoa/SiWtUuq9AmEVOa+SMXNXsQ1j/h58HuUe9U9vorc5IQ== X-YMail-OSG: D1kw7foVM1lONcrQdrjrhsLeXMpBgiu5KoFcpHyOcTEZhM2__uzGDDisDu5at47 LXB5bsR33WsRz46k.FIKdZo6.vwm6UVqe3A5pB6zCRBf8mnpIhrM3wMKjidf9uY4ppr2zU3t4DcK R.kq1znBhsp.JZuWkVUDiwyqhSNmoFSeNprXCgcM9Gu6J0N_ESLqRsdgWW_7uJmUVZlKU0.L7Wm. MTYZva0u6GASxpu0bxQc99CG1AJPNkR2AMjVkHN8VDml5se34UAfcMG6ruzLrIYwyHI5ubuGXCKy Y1BoBzUFOcxZPHyHjBPYq_GbYCOgjA54RmvvivkwKWOw30n41aHbGmOaJ2RhiV.DtiP2Aij45c2B 8oL5jYNrAql2m.Qz909LHwwZVPNEa10vvcHhkNqAuOc.a7.Sc1s7XQlbkthUZLMlPUVJVf21B68B g3zN7pjiQebfKHH_4FOFQjEbEMrvbY2pIOWeO5vhXtjk.3gGMV3LZ4o7NeL6sAzSIsCgVrIdU4q1 BshWjibd4V3tmiH7W30_m_5I0sKmdhl9HyU.4C6DTyWDCxPF9qoD3JNDB80xHA5i4ar5xQOgTuLr yYHxMGbITToRxpk7vuSOfrHogwkdhQwzgFfDi2x3bpQ6JS0U56lOEY9LYGG3W6.HzYb2_FxlHoKY KfRuVv7U6ux.Pe3ntCXqo8gQhS5IZArP0.9fLCfWTnAElCiXls0I0SYZLlDclBmb_qNqt0skjcLR 0iKXmRUwg4TAs3GSZ38.PMQ_AHkhdiPbe7UBuwUSpHapqtwDQtsAKaj7k3kOlmQ6P.ILCvf0PHoV 1iYvX5R.u15WL.0ksV4JBC02hSzEz7b0GTTY551izHuxgZvLH_LSK8PvOa_P8zyDloJmY85.iRex Xgo_sIQ6pcRRDp3HECfKNc43e2ZSS88EcWki_mu7FPPRSUZ6i6q2hhSskxPTm9db_uUYMe4hgnM. Eichun98jNyHBoRI_32LkUptuGuSQ..Qms2T94cgyi0hVnxRz3_QtNLdbfy5h3w0pcgUAzlFP.F_ n22IrMhSbZ3Rip52ERWEXaHuEaDnIduodPZ38wB0WIXKmbjqI_Fq1O7UxgdJCprELWgICT.GYu5v JTAZZmYD4WiPKr4_hQMdBBlex7CKngU3oL_YYjhHx4VNDkrWwRddTrAspyeUgL6tn9Kd9VrNPT6C .JOIMU7nf9XN1ct02E5qOlJ93hJ0yj8NigY.duFovjkd4e9wbu6OjORFjYWDIeXJpj2sgn4WtF6o qQCjS5m2Tnx1.Rs4F3VHx4DLxk3dFd6VHFJtS8gP7qsDzFPGMo_j2Y0hWU2BayhRv.aen.xCJ7MX YsytAb6uKIh4zO8A_1xpTZQI6u6rrOUV_HeGLxv1GTnXdmAS_1z4ORe1wqCmFMsFxJHBPpfe1XKP ZSubzG3_skNxJA2BdoIs1Xtwh1H6mOl4whKcyb0Z4NzHVylgwztgAj69BVXVQcj64tAq8CokXotO V.fb5PSoORzmvgxymHaKr0DgPz529yQB7PMT61zzzso1tX2SP680Bb0AMcCnLbqeiDJiHO7d8Yxb Ei5T2pQpFOzmJPYsloWJGhvUP4lsfOrf2WT6AunnxqrtvrV1OANDOq2UcH6IF.DJopzlOQFWqU99 smFXl7bkNYfsoF.hrLTyFiw.88BnGdJT9yiOLHzv5zp_OyvjVl0hPDPgJn2NsWFVvdIDvTRv5dYF DND.cUbKbxnivHFcFyT1sjYCFenS4A5SpaieNKn36XyOIdpVD3DLJSABessO4iEqYZlbA.12c.D9 l9DJgCZO5sQWChbJmY8tLJSes83vtqWKT1VsT_MeAH7oipwajvqaZpaqrSR6a5CUO9EXSQeYrSpU _So5qzSFd8p03rJhyDYrwo9VkVsTMAhVCnmTRof4QWeI5CbCM6MtdJk2mL0qfLUU3eMxNvUij4Pa .el1iaBe6fhzN6LRGZMP9o9ZhUHYyxeawcDzz99FQMdAr1C28ClcqJyYirnRIOEH0Jvczn9Z4qZw XRVJPfvWhdSZlD0clxSmr_pOJIfFpqTUBevQOPnILFQ0e4oHpWQHTvEdbxO18ho3LivqPcj1rmLk OI9HAm.e8j4A9LqwlWqefkArtBoVd7NSC5jHeMMvX0OkE7sEN29PVh7EZ5uuk.Do2jgOuzX_ku_x cvcxLO73T_qEMrLgmk0jP5tB0ijmmYU5opFoF7nx_sdMxhrfQS18ut36BfROkxZ1bThcIEWGwx3Y N.ffRp_IvcR._dZ87CuISaJYKOhZyADezvEZbuTWh22T7N7iQzkRp1B2jUSqYsbJNR376LTY3_Mv a72VLKapO2X5hOIbEK4uFUwetFviqroUNcQF0 X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.ne1.yahoo.com with HTTP; Tue, 27 Sep 2022 20:12:27 +0000 Received: by hermes--production-gq1-7dfd88c84d-nfz27 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1d976fe2ee917226e6d7cc50e923ce4f; Tue, 27 Sep 2022 20:12:23 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, paul@paul-moore.com, linux-security-module@vger.kernel.org Subject: [PATCH v38 33/39] Audit: Add record for multiple task security contexts Date: Tue, 27 Sep 2022 12:54:15 -0700 Message-Id: <20220927195421.14713-34-casey@schaufler-ca.com> In-Reply-To: <20220927195421.14713-1-casey@schaufler-ca.com> References: <20220927195421.14713-1-casey@schaufler-ca.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: linux-audit@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: john.johansen@canonical.com, selinux@vger.kernel.org, jmorris@namei.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com Errors-To: linux-audit-bounces@redhat.com Sender: "Linux-audit" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Create a new audit record AUDIT_MAC_TASK_CONTEXTS. An example of the MAC_TASK_CONTEXTS (1420) record is: type=MAC_TASK_CONTEXTS[1420] msg=audit(1600880931.832:113) subj_apparmor=unconfined subj_smack=_ When an audit event includes a AUDIT_MAC_TASK_CONTEXTS record the "subj=" field in other records in the event will be "subj=?". An AUDIT_MAC_TASK_CONTEXTS record is supplied when the system has multiple security modules that may make access decisions based on a subject security context. Acked-by: Paul Moore Signed-off-by: Casey Schaufler --- include/uapi/linux/audit.h | 1 + kernel/audit.c | 42 +++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 7c1dc818b1d5..7a5966b46f38 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -143,6 +143,7 @@ #define AUDIT_MAC_UNLBL_STCDEL 1417 /* NetLabel: del a static label */ #define AUDIT_MAC_CALIPSO_ADD 1418 /* NetLabel: add CALIPSO DOI entry */ #define AUDIT_MAC_CALIPSO_DEL 1419 /* NetLabel: del CALIPSO DOI entry */ +#define AUDIT_MAC_TASK_CONTEXTS 1420 /* Multiple LSM task contexts */ #define AUDIT_FIRST_KERN_ANOM_MSG 1700 #define AUDIT_LAST_KERN_ANOM_MSG 1799 diff --git a/kernel/audit.c b/kernel/audit.c index ef6b2d38e38d..fb182f7e9d18 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -2228,6 +2228,7 @@ static void audit_buffer_aux_end(struct audit_buffer *ab) int audit_log_task_context(struct audit_buffer *ab) { + int i; int error; struct lsmblob blob; struct lsmcontext context; @@ -2236,16 +2237,43 @@ int audit_log_task_context(struct audit_buffer *ab) if (!lsmblob_is_set(&blob)) return 0; - error = security_secid_to_secctx(&blob, &context, LSMBLOB_FIRST); - - if (error) { - if (error != -EINVAL) + if (!lsm_multiple_contexts()) { + error = security_secid_to_secctx(&blob, &context, + LSMBLOB_FIRST); + if (error) { + if (error != -EINVAL) + goto error_path; + return 0; + } + audit_log_format(ab, " subj=%s", context.context); + security_release_secctx(&context); + } else { + /* Multiple LSMs provide contexts. Include an aux record. */ + audit_log_format(ab, " subj=?"); + error = audit_buffer_aux_new(ab, AUDIT_MAC_TASK_CONTEXTS); + if (error) goto error_path; - return 0; + for (i = 0; i < LSMBLOB_ENTRIES; i++) { + if (blob.secid[i] == 0) + continue; + error = security_secid_to_secctx(&blob, &context, i); + if (error) { + audit_log_format(ab, "%ssubj_%s=?", + i ? " " : "", + lsm_slot_to_name(i)); + if (error != -EINVAL) + audit_panic("error in audit_log_task_context"); + } else { + audit_log_format(ab, "%ssubj_%s=%s", + i ? " " : "", + lsm_slot_to_name(i), + context.context); + security_release_secctx(&context); + } + } + audit_buffer_aux_end(ab); } - audit_log_format(ab, " subj=%s", context.context); - security_release_secctx(&context); return 0; error_path: -- 2.37.3 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit