ima: Fix undefined arch_ima_get_secureboot() and co
Currently arch_ima_get_secureboot() and arch_get_ima_policy() are defined only when CONFIG_IMA is set, and this makes any code calling those functions without CONFIG_IMA fail. Move the declaration and the dummy definition of those functions outside ifdef-CONFIG_IMA block for fixing the undefined symbols. Signed-off-by: Takashi Iwai <tiwai@suse.de> [zohar@linux.ibm.com: removed in-tree/out-of-tree comment in patch description] Reviewed-by: Petr Vorel <pvorel@suse.cz> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Родитель
1360572566
Коммит
54bf7fa3ef
|
@ -50,21 +50,6 @@ static inline void ima_appraise_parse_cmdline(void) {}
|
||||||
extern void ima_add_kexec_buffer(struct kimage *image);
|
extern void ima_add_kexec_buffer(struct kimage *image);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT
|
|
||||||
extern bool arch_ima_get_secureboot(void);
|
|
||||||
extern const char * const *arch_get_ima_policy(void);
|
|
||||||
#else
|
|
||||||
static inline bool arch_ima_get_secureboot(void)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline const char * const *arch_get_ima_policy(void)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
static inline enum hash_algo ima_get_current_hash_algo(void)
|
static inline enum hash_algo ima_get_current_hash_algo(void)
|
||||||
{
|
{
|
||||||
|
@ -155,6 +140,21 @@ static inline int ima_measure_critical_data(const char *event_label,
|
||||||
|
|
||||||
#endif /* CONFIG_IMA */
|
#endif /* CONFIG_IMA */
|
||||||
|
|
||||||
|
#ifdef CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT
|
||||||
|
extern bool arch_ima_get_secureboot(void);
|
||||||
|
extern const char * const *arch_get_ima_policy(void);
|
||||||
|
#else
|
||||||
|
static inline bool arch_ima_get_secureboot(void)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline const char * const *arch_get_ima_policy(void)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_IMA_KEXEC
|
#ifndef CONFIG_IMA_KEXEC
|
||||||
struct kimage;
|
struct kimage;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче