lkml.org 
[lkml]   [2022]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 2/2] certs: Remove panic() calls from system_trusted_keyring_init()
Date
From: Mickaël Salaün <mic@linux.microsoft.com>

Replace panic() calls from device_initcall(system_trusted_keyring_init)
with proper error handling using -ENODEV.

Suggested-by: Jarkko Sakkinen <jarkko@kernel.org> [1]
Link: https://lore.kernel.org/r/Yik0C2t7G272YZ73@iki.fi [1]
Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
Link: https://lore.kernel.org/r/20220311174741.250424-3-mic@digikod.net
---
certs/system_keyring.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 05b66ce9d1c9..428046a7aa7f 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -148,8 +148,10 @@ static __init int system_trusted_keyring_init(void)
KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH),
KEY_ALLOC_NOT_IN_QUOTA,
NULL, NULL);
- if (IS_ERR(builtin_trusted_keys))
- panic("Can't allocate builtin trusted keyring\n");
+ if (IS_ERR(builtin_trusted_keys)) {
+ pr_err("Can't allocate builtin trusted keyring\n");
+ return -ENODEV;
+ }

#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
secondary_trusted_keys =
@@ -161,14 +163,26 @@ static __init int system_trusted_keyring_init(void)
KEY_ALLOC_NOT_IN_QUOTA,
get_builtin_and_secondary_restriction(),
NULL);
- if (IS_ERR(secondary_trusted_keys))
- panic("Can't allocate secondary trusted keyring\n");
+ if (IS_ERR(secondary_trusted_keys)) {
+ pr_err("Can't allocate secondary trusted keyring\n");
+ goto err_secondary;
+ }

- if (key_link(secondary_trusted_keys, builtin_trusted_keys) < 0)
- panic("Can't link trusted keyrings\n");
+ if (key_link(secondary_trusted_keys, builtin_trusted_keys) < 0) {
+ pr_err("Can't link trusted keyrings\n");
+ goto err_link;
+ }
#endif

return 0;
+
+err_link:
+ key_put(secondary_trusted_keys);
+
+err_secondary:
+ key_put(builtin_trusted_keys);
+
+ return -ENODEV;
}

/*
--
2.35.1
\
 
 \ /
  Last update: 2022-03-11 18:49    [W:0.063 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site