[PATCH AUTOSEL 5.2 116/249] integrity: Fix __integrity_init_keyring() section mismatch

Sasha Levin sashal at kernel.org
Mon Jul 15 13:44:41 UTC 2019

From: Geert Uytterhoeven <geert at linux-m68k.org>

[ Upstream commit 8c655784e2cf59cb6140759b8b546d98261d1ad9 ]

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 at linux-m68k.org>
Reviewed-by: Nayna Jain <nayna at linux.ibm.com>
Reviewed-by: James Morris <jamorris at linux.microsoft.com>
Signed-off-by: Mimi Zohar <zohar at linux.ibm.com>
Signed-off-by: Sasha Levin <sashal at kernel.org>
 security/integrity/digsig.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 4582bc26770a..868ade3e8970 100644
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -69,8 +69,9 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
 	return -EOPNOTSUPP;
-static int __integrity_init_keyring(const unsigned int id, key_perm_t perm,
-				    struct key_restriction *restriction)
+static int __init __integrity_init_keyring(const unsigned int id,
+					   key_perm_t perm,
+					   struct key_restriction *restriction)
 	const struct cred *cred = current_cred();
 	int err = 0;

More information about the Linux-security-module-archive mailing list