Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s390/pkey: Build module name array selectively based on kernel config options

Browse Source 
There is a static array of pkey handler kernel module names
used in case the pkey_handler_request_modules() is invoked.
This static array is walked through and if the module is not
already loaded a module_request() is performed.

This patch reworks the code to instead of unconditionally
building up a list of module names into the array, only the
pkey handler modules available based on the current kernel
config options are inserted.

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Reviewed-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
Harald Freudenberger 2024-10-25 12:34:31 +02:00 committed by Heiko Carstens
parent 1bcf8d9a0c
commit eb37a9aea6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/s390/crypto/pkey_base.c
View File

@ -304,7 +304,16 @@ void pkey_handler_request_modules(void)
{
#ifdef CONFIG_MODULES
static const char * const pkey_handler_modules[] = {
"pkey_cca", "pkey_ep11", "pkey_pckmo" };
#if IS_MODULE(CONFIG_PKEY_CCA)
"pkey_cca",
#endif
#if IS_MODULE(CONFIG_PKEY_EP11)
"pkey_ep11",
#endif
#if IS_MODULE(CONFIG_PKEY_PCKMO)
"pkey_pckmo",
#endif
};
int i;
for (i = 0; i < ARRAY_SIZE(pkey_handler_modules); i++) {