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 1/2] certs: Remove panic() calls from blacklist_init()
Date
From: Mickaël Salaün <mic@linux.microsoft.com>

Replace panic() calls from device_initcall(blacklist_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-2-mic@digikod.net
---
certs/blacklist.c | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/certs/blacklist.c b/certs/blacklist.c
index 486ce0dd8e9c..ea7a77f156da 100644
--- a/certs/blacklist.c
+++ b/certs/blacklist.c
@@ -313,12 +313,16 @@ static int __init blacklist_init(void)
const char *const *bl;
struct key_restriction *restriction;

- if (register_key_type(&key_type_blacklist) < 0)
- panic("Can't allocate system blacklist key type\n");
+ if (register_key_type(&key_type_blacklist) < 0) {
+ pr_err("Can't allocate system blacklist key type\n");
+ return -ENODEV;
+ }

restriction = kzalloc(sizeof(*restriction), GFP_KERNEL);
- if (!restriction)
- panic("Can't allocate blacklist keyring restriction\n");
+ if (!restriction) {
+ pr_err("Can't allocate blacklist keyring restriction\n");
+ goto err_restriction;
+ }
restriction->check = restrict_link_for_blacklist;

blacklist_keyring =
@@ -333,13 +337,24 @@ static int __init blacklist_init(void)
, KEY_ALLOC_NOT_IN_QUOTA |
KEY_ALLOC_SET_KEEP,
restriction, NULL);
- if (IS_ERR(blacklist_keyring))
- panic("Can't allocate system blacklist keyring\n");
+ if (IS_ERR(blacklist_keyring)) {
+ pr_err("Can't allocate system blacklist keyring\n");
+ goto err_keyring;
+ }

for (bl = blacklist_hashes; *bl; bl++)
if (mark_raw_hash_blacklisted(*bl) < 0)
pr_err("- blacklisting failed\n");
return 0;
+
+
+err_keyring:
+ kfree(restriction);
+
+err_restriction:
+ unregister_key_type(&key_type_blacklist);
+
+ return -ENODEV;
}

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