integrity, KEYS: Fix build break with set_platform_trusted_keys
Subsystems (5)
PATCH 1/1 integrity, KEYS: Fix build break with set_platform_trusted_keys
Commit 15ebb2eb0705 ("integrity, KEYS: add a reference to platform keyring") introduced a function set_platform_trusted_keys and calls the function in __integrity_init_keyring.
It only checks if CONFIG_INTEGRITY_PLATFORM_KEYRING is enabled when enabling this function, but actually this function also depends on CONFIG_SYSTEM_TRUSTED_KEYRING.
So when built with CONFIG_INTEGRITY_PLATFORM_KEYRING && !CONFIG_SYSTEM_TRUSTED_KEYRING. we will get following error:
digsig.c:92: undefined reference to `set_platform_trusted_keys'
And it also mistakenly wrapped the function code in the ifdef block of CONFIG_SYSTEM_DATA_VERIFICATION.
This commit fixes the issue by adding the missing check of CONFIG_SYSTEM_TRUSTED_KEYRING and move the function code out of CONFIG_SYSTEM_DATA_VERIFICATION's ifdef block.
--- certs/system_keyring.c | 4 ++-- include/keys/system_keyring.h | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-)
certs/system_keyring.c +2 -2
@@ -279,11 +279,11 @@ int verify_pkcs7_signature(const void *data, size_t len, }EXPORT_SYMBOL_GPL (verify_pkcs7_signature); +#endif /* CONFIG_SYSTEM_DATA_VERIFICATION */ +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING void __init set_platform_trusted_keys (struct key *keyring) { platform_trusted_keys = keyring; }#endif - -#endif /* CONFIG_SYSTEM_DATA_VERIFICATION */
include/keys/system_keyring.h +3 -6
@@ -61,16 +61,13 @@ static inline struct key *get_ima_blacklist_keyring(void) }#endif /* CONFIG_IMA_BLACKLIST_KEYRING */ -#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING - +#if defined(CONFIG_INTEGRITY_PLATFORM_KEYRING ) && \ + defined(CONFIG_SYSTEM_TRUSTED_KEYRING )extern void __init set_platform_trusted_keys (struct key *keyring); -#else -static inline void set_platform_trusted_keys (struct key *keyring) { } - -#endif /* CONFIG_INTEGRITY_PLATFORM_KEYRING */ +#endif #endif /* _KEYS_SYSTEM_KEYRING_H */
Signature · 1 line
2.20.1
Mimi Zohar
maintainerQuoted 16 lines · Kairui Song
Commit
15ebb2eb0705("integrity, KEYS: add a reference to platform keyring") introduced a functionset_platform_trusted_keysand calls the function in__integrity_init_keyring.It only checks if
CONFIG_INTEGRITY_PLATFORM_KEYRINGis enabled when enabling this function, but actually this function also depends onCONFIG_SYSTEM_TRUSTED_KEYRING.So when built with
CONFIG_INTEGRITY_PLATFORM_KEYRING&& !CONFIG_SYSTEM_TRUSTED_KEYRING. we will get following error:digsig.c:92: undefined reference to `set_platform_trusted_keys'
And it also mistakenly wrapped the function code in the ifdef block of
CONFIG_SYSTEM_DATA_VERIFICATION.
Quoted 6 lines
This commit fixes the issue by adding the missing check of
CONFIG_SYSTEM_TRUSTED_KEYRINGand move the function code out of CONFIG_SYSTEM_DATA_VERIFICATION's ifdef block.Fixes 15ebb2eb0705 ("integrity, KEYS: add a reference to platform keyring")Signed-off-by Kairui Song <[email protected]>
Thank you. As the original patch hasn't yet been upstreamed , I plan on squashing them.
Mimi
Quoted 47 lines
--- certs/system_keyring.c | 4 ++-- include/keys/system_keyring.h | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-)certs/system_keyring.c +2
-2@@ -279,11 +279,11 @@ int verify_pkcs7_signature(const void *data, size_t len, }EXPORT_SYMBOL_GPL (verify_pkcs7_signature); +#endif /* CONFIG_SYSTEM_DATA_VERIFICATION */ +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING void __init set_platform_trusted_keys (struct key *keyring) { platform_trusted_keys = keyring; }#endif - -#endif /* CONFIG_SYSTEM_DATA_VERIFICATION */ include/keys/system_keyring.h +3
-6@@ -61,16 +61,13 @@ static inline struct key *get_ima_blacklist_keyring(void) }#endif /* CONFIG_IMA_BLACKLIST_KEYRING */ -#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING - +#if defined(CONFIG_INTEGRITY_PLATFORM_KEYRING ) && \ + defined(CONFIG_SYSTEM_TRUSTED_KEYRING )extern void __init set_platform_trusted_keys (struct key *keyring); -#else -static inline void set_platform_trusted_keys (struct key *keyring) { } - -#endif /* CONFIG_INTEGRITY_PLATFORM_KEYRING */ +#endif #endif /* _KEYS_SYSTEM_KEYRING_H */