]> git.ipfire.org Git - thirdparty/linux.git/commit
integrity: Fix __integrity_init_keyring() section mismatch
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 17 Jun 2019 07:44:52 +0000 (09:44 +0200)
committerMimi Zohar <zohar@linux.ibm.com>
Mon, 17 Jun 2019 18:13:20 +0000 (14:13 -0400)
commit8c655784e2cf59cb6140759b8b546d98261d1ad9
tree2f78fe90d28adcf72599f95b61a3551c163d004b
parente038f5f691e003af25cda0f1593d2cc0a4d1c866
integrity: Fix __integrity_init_keyring() section mismatch

With gcc-4.6.3:

    WARNING: vmlinux.o(.text.unlikely+0x24c64): Section mismatch in reference from the function __integrity_init_keyring() to the function .init.text:set_platform_trusted_keys()
    The function __integrity_init_keyring() references
    the function __init set_platform_trusted_keys().
    This is often because __integrity_init_keyring lacks a __init
    annotation or the annotation of set_platform_trusted_keys is wrong.

Indeed, if the compiler decides not to inline __integrity_init_keyring(),
a warning is issued.

Fix this by adding the missing __init annotation.

Fixes: 9dc92c45177ab70e ("integrity: Define a trusted platform keyring")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Nayna Jain <nayna@linux.ibm.com>
Reviewed-by: James Morris <jamorris@linux.microsoft.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
security/integrity/digsig.c