Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Eric Snowberg <eric.snowberg@oracle.com>
To:     zohar@linux.ibm.com
Cc:     dmitry.kasatkin@gmail.com, jarkko@kernel.org, paul@paul-moore.com,
        jmorris@namei.org, serge@hallyn.com, eric.snowberg@oracle.com,
        linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/2] ima: Reword IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
Date:   Mon,  6 Nov 2023 18:06:25 -0500
Message-Id: <20231106230626.2730342-2-eric.snowberg@oracle.com>
In-Reply-To: <20231106230626.2730342-1-eric.snowberg@oracle.com>
References: <20231106230626.2730342-1-eric.snowberg@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xQyr1+8ClT1Vl7BJ+VHKqtk4ZzCT0Shx6H1THiFp/iGRj74+/tLi0Sb25vrX?=
 =?us-ascii?Q?/ySpl1P+VgqcLyYOfnyy7bGt/xi1SerlmZBeD04KY0eA/RZH0B4ym9p7ntJx?=
 =?us-ascii?Q?ABWf2ZvCG3tDodLU5ORmt1cq0eNRAmGCI6qGHzcWklHbiMObAgd4t8NHWrgO?=
 =?us-ascii?Q?89EWvZ+h+URk6VJOJv/k4Y09x72N3FX5KsBvahcaBcU1Cp0yLGuXxafhe5Rl?=
 =?us-ascii?Q?ZKTBcELt0JpOpDKktwt2emaH7kSINsOpQcBDcfSoi8iWDqBP4mYQ/lcpE1ap?=
 =?us-ascii?Q?AcLxSfHyzxn3ItvZBtcUNV55cP4Fah3HHVyH07BwZq7/RQbpEFNThpzOUWU3?=
 =?us-ascii?Q?eJX9x4RlLJZQFz9PHWL9+tKTvWK+0C4aENwgty3gVK1cqzcd02HxdltvzAVC?=
 =?us-ascii?Q?Mpbhp0/qN4RWSQrKvB3oEwRqxXsLAG9GULNwqoDKUpWXyDASDGjbSTA2Cnnn?=
 =?us-ascii?Q?GrGS+hIPRPZLcBiCW2nHcjzPVT/fzsFYf/LonD7IX5ixoNQCucMVRZK3x+9K?=
 =?us-ascii?Q?FDMh8wLj+/X4+ns/qm/Hte2p3YCxoxKPN2F5Lub5cw4tl5AkwWpYBrYExYF/?=
 =?us-ascii?Q?o9m69PhnpEOM01isn3m/EklwpaYPh8BZNr4fB3wnyWDlnQBYSZ8pX4R1p7Q/?=
 =?us-ascii?Q?xB0s19Nw6eOJkVYChIbvjmRqbV5jd3nTPJKplhftGvXilTlzDbDP1rHt4CQU?=
 =?us-ascii?Q?rJbPM3QpvMZKbR0MchpXDLfc1QCslsrvFC1xVChV5bYb9XGO7zgFRciNTefB?=
 =?us-ascii?Q?mPHbSBuiIwlsM6WPqkJG4LP6cnajkN6PW/Gv3/LtYP5hOgMWKzZRKTzeQcst?=
 =?us-ascii?Q?eucb9FgRU9dApXbK4GojG8nd6+yRBVKNaBeYqZUnPq26ZQcPF/9h5unql0f2?=
 =?us-ascii?Q?TvfDbR0I6AH9GqcAG/z5Ie4mh2Svkzazr/YtkBuQikAEFyfdF45k7BXnPhE2?=
 =?us-ascii?Q?6eH4qWuiriBJQfuAp5v9wGXe1vRuD/KMkpc4wnujmnsX6wjx2jwRZQM6LxLF?=
 =?us-ascii?Q?rfSPZO4Rkyim+0IY4A84A3pSDyj+vZnBNPxXh9CHNmlT271/6P3hGtqwHqFP?=
 =?us-ascii?Q?UJC7tDssmqRQ04++5+B3BSMDy/Wj0/UeVjbq6QzpF5wnfg//uX4A4xaWM6B2?=
 =?us-ascii?Q?rc6++z6gy0z6+DnhNcurUivjf89QyziMQ5+9dLLsFVPwVNjxAtmrfYR1goBS?=
 =?us-ascii?Q?RGo5QTJm7eV6Z+7DDadkxEWC4uJw28Kzk+BuHe7Qci+zTNRQyhX+wxnYL09L?=
 =?us-ascii?Q?BeNRSyy4ULoPhh7Kcy6Ey/FEdonLCuewaKGgpwShng4FF9GMeqnczxp2nwSV?=
 =?us-ascii?Q?UL6GEGcwFymBNOdNteQMZAKfySn5j14AOpDQtN/f/mDqBalFx3M9k6ITXKe1?=
 =?us-ascii?Q?oXuu1OT9SF/Jku7EZPorLhzlIKkeJbTLQgSUU9ygE/wpsis03+QLe+nJdfSm?=
 =?us-ascii?Q?KwWoigUL7jdw0D8W3mOg5UvxdHmhbf92DHS+jWe98L62LMA3LXNFUZog6Nah?=
 =?us-ascii?Q?ZJugD55Zk2j7JEoisRSDVedlETGoYVQoKur3UjjkmgSm54q+TpxqdbVGBrLO?=
 =?us-ascii?Q?pxpOt48kQbY7XHc8o+jcxBOOlnUq92pFqM/VsCI815MNhleFIiYkbH6JCFct?=
 =?us-ascii?Q?s4y/tm/4ddAm6wvPnfbGV/E=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?REZ0RnTI175oKRXYl+kL1IjxuZCxjeehD2zTDjn37inWOEsK2ZOq4DvfUMn9?=
 =?us-ascii?Q?iowZc7PHNWT+Ew6Voqs1oC+gSEXDy3xnm8ow6oj4u6VrBliqnLAxjNdo7qRY?=
 =?us-ascii?Q?CMWh/ERwpYmtp6ylyYhFOiPNSC0RgpdjxBe8ppT1YE4AE0RRdz6JaAIdlMqK?=
 =?us-ascii?Q?lG+PbWRGzZCjEiYpSxBxfTZ99tDUVKmTrJURD2iO8IYzF1IdyK902o85U65m?=
 =?us-ascii?Q?7f4WKa6d44vZJDybCH6ryLPgu0E1YF0AJPIpC37sz0usez5rIgLEOPMNlUcS?=
 =?us-ascii?Q?wwzVxJn3vpB5f+zzkpkX/Q7YXIChHaILIVet9its2AfDfOYcTvDlIQT+rpZD?=
 =?us-ascii?Q?b78+a0fV0e/9C1XXeJvrec/icbHpPMNCK3NMlFV6jQvk5nv50ZkwDhdfJrUP?=
 =?us-ascii?Q?dxDLM/wQwv1uUa1q8yj7JzO64tnDThXIT4dqNg2uLoXr2kiiI1LXrje/O4To?=
 =?us-ascii?Q?SiLlNR+xHmlupO+2mIXJp33rAprKnH1xuUd67ePZCBoNK7ifmdxIxW/odiVp?=
 =?us-ascii?Q?5vIeeDrrpSjelLLJAd8svHkznJ2CkTb3G0uPIfBRgNpA+ilfR2JBWE+jJKOz?=
 =?us-ascii?Q?UncnbNCifn3OC5vyHBYQMm/6anmuPueZJro0d4me3/MWFI4Uc4Jn0RPkQloJ?=
 =?us-ascii?Q?7IAcpXOlje4GyNaUCszW0cVQVZJ0SLdfjT86JV5pHTjwbCBeo3s+phiZRTsd?=
 =?us-ascii?Q?1IBcxbjZt5Zibg+ZFkCxGFlOfJ/CytIEUaB9lldvRKqxJBR1Y5qn9fvjvYq7?=
 =?us-ascii?Q?lCR3bpvVG1x4IQ4kdi24rm9vFOurIgtnyWWw2oVK/cavtxvV77hHE7ZgGq3U?=
 =?us-ascii?Q?6AF3Ei5Rfe3GCPf8KnjzkRWYEUBl1FE6F0WqFzrD6+NshH0uNO0PNs5ZhzUT?=
 =?us-ascii?Q?qTtQuTnQ9VroQNr1/CzogrWD8ULrPrx6jRGDyPJUUcVzAYUAI5O7HatesotP?=
 =?us-ascii?Q?TCoiZVHrDDHtr8GbwDzxIg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 769efc03-cca2-4214-d966-08dbdf1dc562
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4150.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 23:11:56.3758
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mCvj6gPI7BrFbfJPCb315EwJAssUV8vE+ZK7+ISk+7S70sIw6NwzgDRhETryX0+QI1qMuFHfpFaBY1BxieZexa7rqmzKjhN8h+/sUkRJhbE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7479
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-06_15,2023-11-02_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 mlxscore=0
 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000
 definitions=main-2311060190
X-Proofpoint-ORIG-GUID: 8EHlRJTn7f4BrNednzVdqEYz-pnE_9DH
X-Proofpoint-GUID: 8EHlRJTn7f4BrNednzVdqEYz-pnE_9DH
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 15:12:27 -0800 (PST)

When the machine keyring is enabled, it may be used as a trust source
for the .ima keyring.  Add a reference to this in
IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 security/integrity/ima/Kconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index a6bd817efc1a..a0a767dc5c04 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -243,7 +243,7 @@ config IMA_APPRAISE_MODSIG
 	   to accept such signatures.
 
 config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
-	bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)"
+	bool "Permit keys validly signed by a built-in, machine (if configured) or secondary (EXPERIMENTAL)"
 	depends on SYSTEM_TRUSTED_KEYRING
 	depends on SECONDARY_TRUSTED_KEYRING
 	depends on INTEGRITY_ASYMMETRIC_KEYS
@@ -251,14 +251,14 @@ config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
 	default n
 	help
 	  Keys may be added to the IMA or IMA blacklist keyrings, if the
-	  key is validly signed by a CA cert in the system built-in or
-	  secondary trusted keyrings. The key must also have the
-	  digitalSignature usage set.
+	  key is validly signed by a CA cert in the system built-in,
+	  machine (if configured), or secondary trusted keyrings. The
+	  key must also have the digitalSignature usage set.
 
 	  Intermediate keys between those the kernel has compiled in and the
 	  IMA keys to be added may be added to the system secondary keyring,
 	  provided they are validly signed by a key already resident in the
-	  built-in or secondary trusted keyrings.
+	  built-in, machine (if configured) or secondary trusted keyrings.
 
 config IMA_BLACKLIST_KEYRING
 	bool "Create IMA machine owner blacklist keyrings (EXPERIMENTAL)"
-- 
2.39.3