Received-SPF: pass (google.com: domain of linux-crypto+bounces-2605-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Eric Snowberg <eric.snowberg@oracle.com>
To: linux-security-module@vger.kernel.org
Cc: dhowells@redhat.com, dwmw2@infradead.org, herbert@gondor.apana.org.au,
        davem@davemloft.net, ardb@kernel.org, jarkko@kernel.org,
        paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com,
        zohar@linux.ibm.com, roberto.sassu@huawei.com,
        dmitry.kasatkin@gmail.com, mic@digikod.net, casey@schaufler-ca.com,
        stefanb@linux.ibm.com, eric.snowberg@oracle.com,
        linux-kernel@vger.kernel.org, keyrings@vger.kernel.org,
        linux-crypto@vger.kernel.org, linux-efi@vger.kernel.org,
        linux-integrity@vger.kernel.org
Subject: [PATCH RFC 1/8] certs: Introduce ability to link to a system key
Date: Mon, 11 Mar 2024 12:11:04 -0400
Message-Id: <20240311161111.3268190-2-eric.snowberg@oracle.com>
In-Reply-To: <20240311161111.3268190-1-eric.snowberg@oracle.com>
References: <20240311161111.3268190-1-eric.snowberg@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?qYyu1wHpVUxVrrxGZEz+jEQ9H1uab/WikCLXZh4EL9as5jbjKFKk5C9ih/jD?=
 =?us-ascii?Q?g9njR2eneMhMlAruYVhGOpLG9F6NSsN99VN/lE/CmdlXn7oP9GV2VSHsvE2u?=
 =?us-ascii?Q?Txb98CtVqz9ytIVgekXw5rOl9PtU1H3v+QtMYu8JZFS0yyk6TcDkeu9ZmSHk?=
 =?us-ascii?Q?Nvx1HGfB44r3P2Uss9gvcJ3xZFTi3MBmZZLoceALKaM2Y8orYb5vOmlVWzIz?=
 =?us-ascii?Q?X/dXhcTnzaUAJGzKCzygOqocNig/HqugspNi8R2OjskfwcU8bCcXHaXj7EEl?=
 =?us-ascii?Q?v1XLMN5iVu7F5O5dPLwVP1irUKWI2FyRUeJ136JcC2slfVK6BgK21VcZ2S93?=
 =?us-ascii?Q?IbGtpHBKoOU4ZEzY7O7DfjALWncdy5v1lPr/cmiLUUh6hBXWKZvWK1bGURRw?=
 =?us-ascii?Q?+KnKcX/9iZjRaBQNl1oVF7IBVpApUmmi/HUEldbYOSzKzoc3lzwvCXG7kyY5?=
 =?us-ascii?Q?5mMDyePvbZeZ8hFEsdi3z8XE7J9YjL//j1XsgR40EBV6Sn7ZwZ+uE3RJJO2Y?=
 =?us-ascii?Q?eG13x+i09ql0tg34Lb/GNzeRJbA8UprOV3lsGrnV8fd9me1GjhZMgw/i0tjz?=
 =?us-ascii?Q?vdb4C0XVdDSBhUpkMrdFOAk8EaTfkeHx0tIj19C1l/bPCASU88MI09SID42Y?=
 =?us-ascii?Q?OZemas/+0uV89nnqtQ8JrEb6N/W5Zt5erCYcDQ5AZkDdkSnabAEIE1klbUHl?=
 =?us-ascii?Q?Aqg0NXUYPN+ZOEPn49TQDLL8crbaxnZU8i4b662mNwTUS10hU3T8BPOoIZGn?=
 =?us-ascii?Q?MIVqQv1rs7Rtqg89wfia43zQ7OOWoMNmNbNo4V0MwuGo/57+704yEZKDkI+b?=
 =?us-ascii?Q?LPviSjUi/MKyYMMGncuNhQt6SXTW9q7HiSLIQWMJI1rEaIXimwfO5eiBDrPk?=
 =?us-ascii?Q?PbiHJABdAe3x703slyAGkGziTSA1Fk17jHCAFHXRIUFM5YKtel2fWFhj+IP7?=
 =?us-ascii?Q?EQoNp5/XD07OvJQO4VIAqe4TlYkLCpnWkNWLba6rpDBzDvl9y5tWl1xoUDau?=
 =?us-ascii?Q?9rFZbft1RvdqFrlxsPNysAI4IMG6eka2yqE1kNcgkmNPNR+Hu6+enh67XlY+?=
 =?us-ascii?Q?6v4Pb5AyqsmDMfwwykqSGjfxocC8oM9dm+JKN5O42WjinyqZL5IjzFzEqH+L?=
 =?us-ascii?Q?jTTo7e+28BhUsu5XG5fypVt84RzAxM1DaKF33mJEYge67toNj23/uOuOvT65?=
 =?us-ascii?Q?edDt9pdK8oaDHRe9b5OGBbw6rS7CUOE3xognW2vWtuuyja4yoVq3E3q0W3gu?=
 =?us-ascii?Q?ovTvhvdoI/c6CmauUMhgvkbxDjDiFNIc7HMLFpO8Exp8t7z8fvVJGo3/Vz6g?=
 =?us-ascii?Q?I4yBrU+2cCZmT+42kwASwKMF/YNp8Y6iOejERwkdYrop4Km2dE5t5UCkvdY6?=
 =?us-ascii?Q?VpSYxIU9+7eEfWYCxQgmpNyN7i9xHKY+1foybfzEs6p3SW2LCg9xy2zq1OM9?=
 =?us-ascii?Q?e88isPpT5Ar1D6KMMyYGn5GYyBchIQhxGRFhhcp2gzEn4tnZyln3sr81JbtX?=
 =?us-ascii?Q?WV7aEFeAS8bv2gcfltJLxIoX1RgxkVW7c3WisC5oCyqE+D9PUHduhR9P5KOV?=
 =?us-ascii?Q?uHhRTKp49bRdFFiK59m26Wp5F5hx1KC1N/bKnKk3pPNtQoFxf/6NnG4UgHzq?=
 =?us-ascii?Q?qkOMyujkctREAew6o81XRcA=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	WrgeNq+91v0vK+F35zxMq/F8g1q6Tv8Pranyh718jLOXxPb8Xcxs6tc4zRlnQca68LDUuYiSHUBvZyrin+FQiKT8uLDZG1j5nAPAqPBbxmHR/LfrC0+/QOPTYH3YjHqlyv5b5FL2+pXqy5fFeNqBKrKdA+Ro3+nMfPk7G8+3KPLR313zm0gI5wiIKkxHGJrQMbWzqJLChksvID/CM9KHhxB1krDAfxotDmCjoPnvsJ58l/q3BQzZr7aQnIAZF7bmx6tnSvdVchztt2FQtcsC8zWAR3OevZYY8VOPu1F2gOn77doayUGnANGWDtWG0SN070IIT5sEqc+gZm1rAHTcpbkr5I1rrFSuaVzheLezn1tiZ5Xrjl8HHeBPBlQuIjSFiKSvWyg3BqD+7JX4T6+C4ObRG+WeFvp+5LojUHd/ZUGQpteB7f0VS8P673UyaDWXFtUvZ/8gNqVy3YRKNKKGeakQ7TbTit2uHdnasAecQ95YUxwMQT8yFvBfGOQRoVbwvSn3Ry14jV1xcK6Vl/1XSya6efHIkPZOUF3ZB1aw0KAFIrU/Dv3yN6Qgbj07wQUFGMSimbOLTKu1VrJQX5tx7mKUKqr6GXv6s9sxVJz2hYQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 91c2d175-7772-45ac-8704-08dc41e6f92a
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4150.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 16:19:06.1183
 (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: /Rjt10SPNusHNgB8sD8FAwbBmnhbVXYGRuf1X3qUhMsop+oVAc1u5V2zPlChYcYYOK5vCAHFy6k9T42f52ceGj0Sdnigbx9aTA5A8wN0q/E=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5119
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-11_10,2024-03-11_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 spamscore=0
 bulkscore=0 phishscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2403110124
X-Proofpoint-ORIG-GUID: petUOOvSs8CXjtihdtNeuzSIqKO4o7RO
X-Proofpoint-GUID: petUOOvSs8CXjtihdtNeuzSIqKO4o7RO

Introduce a new function to allow a keyring to link to a key contained
within one of the system keyrings (builtin, secondary, or platform).
Depending on how the kernel is built, if the machine keyring is
available, it will be checked as well, since it is linked to the secondary
keyring. If the asymmetric key id matches a key within one of these
system keyrings, the matching key is linked into the passed in
keyring.

Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
---
 certs/system_keyring.c        | 29 +++++++++++++++++++++++++++++
 include/keys/system_keyring.h |  7 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 9de610bf1f4b..b647be49f6e0 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -426,3 +426,32 @@ void __init set_platform_trusted_keys(struct key *keyring)
 	platform_trusted_keys = keyring;
 }
 #endif
+
+/**
+ * system_key_link - Link to a system key
+ * @keyring: The keyring to link into
+ * @id: The asymmetric key id to look for in the system keyring
+ */
+int system_key_link(struct key *keyring, struct asymmetric_key_id *id)
+{
+	struct key *tkey;
+
+#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
+	tkey = find_asymmetric_key(secondary_trusted_keys, id, NULL, NULL, false);
+#else
+	tkey = find_asymmetric_key(builtin_trusted_keys, id, NULL, NULL, false);
+#endif
+	if (!IS_ERR(tkey))
+		goto found;
+
+	tkey = find_asymmetric_key(platform_trusted_keys, id, NULL, NULL, false);
+
+	if (!IS_ERR(tkey))
+		goto found;
+
+	return -1;
+
+found:
+	key_link(keyring, tkey);
+	return 0;
+}
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
index 8365adf842ef..b47ac8e2001a 100644
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
@@ -9,6 +9,7 @@
 #define _KEYS_SYSTEM_KEYRING_H
 
 #include <linux/key.h>
+struct asymmetric_key_id;
 
 enum blacklist_hash_type {
 	/* TBSCertificate hash */
@@ -28,7 +29,7 @@ int restrict_link_by_digsig_builtin(struct key *dest_keyring,
 				    const union key_payload *payload,
 				    struct key *restriction_key);
 extern __init int load_module_cert(struct key *keyring);
-
+extern int system_key_link(struct key *keyring, struct asymmetric_key_id *id);
 #else
 #define restrict_link_by_builtin_trusted restrict_link_reject
 #define restrict_link_by_digsig_builtin restrict_link_reject
@@ -38,6 +39,10 @@ static inline __init int load_module_cert(struct key *keyring)
 	return 0;
 }
 
+static inline int system_key_link(struct key *keyring, struct asymmetric_key_id *id)
+{
+	return 0;
+}
 #endif
 
 #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
-- 
2.39.3