# \[PATCH v8 09/17\] KEYS: Rename get\_builtin\_and\_secondary\_restriction - From: Eric Snowberg \ - Date: 2021-11-24 04:43:08 - List: linux-security-module - Page: https://ratatoskr.run/linux-security-module/2021/11/1583501 - Thread: https://ratatoskr.run/keyrings/2021/11/1583494/t.md ```text In preparation for returning either the existing restrict_link_by_builtin_and_secondary_trusted or the upcoming restriction that includes the trusted builtin, secondary and machine keys, to improve clarity, rename get_builtin_and_secondary_restriction to get_secondary_restriction. Suggested-by: Mimi Zohar Signed-off-by: Eric Snowberg Reviewed-by: Mimi Zohar --- v6: Initial version v7: Unmodified from v7 v8: Code unmodified from v7, added Mimi's Reviewed-by --- certs/system_keyring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 692365dee2bd..8f1f87579819 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -77,7 +77,7 @@ int restrict_link_by_builtin_and_secondary_trusted( * Allocate a struct key_restriction for the "builtin and secondary trust" * keyring. Only for use in system_trusted_keyring_init(). */ -static __init struct key_restriction *get_builtin_and_secondary_restriction(void) +static __init struct key_restriction *get_secondary_restriction(void) { struct key_restriction *restriction; @@ -117,7 +117,7 @@ static __init int system_trusted_keyring_init(void) KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH | KEY_USR_WRITE), KEY_ALLOC_NOT_IN_QUOTA, - get_builtin_and_secondary_restriction(), + get_secondary_restriction(), NULL); if (IS_ERR(secondary_trusted_keys)) panic("Can't allocate secondary trusted keyring\n"); -- 2.18.4 ```