integrity: Fix __integrity_init_keyring() section mismatch
Subsystems (3)
PATCH 1/1 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.
--- security/integrity/digsig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
security/integrity/digsig.c +3 -2
@@ -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 ;
Signature · 1 line
2.17.1
Quoted 8 lines · Geert Uytterhoeven
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__initset_platform_trusted_keys().
This is often because__integrity_init_keyringlacks a__init
annotation or the annotation ofset_platform_trusted_keysis wrong.
Quoted 7 lines
Indeed, if the compiler decides not to inline
__integrity_init_keyring(), a warning is issued.Fix this by adding the missing
__initannotation.Fixes 9dc92c45177ab70e ("integrity: Define a trusted platform keyring")Signed-off-by Geert Uytterhoeven <[email protected]>
Thanks for fixing it.
Thanks & Regards,
- Nayna
Quoted 8 lines · Geert Uytterhoeven
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__initset_platform_trusted_keys().
This is often because__integrity_init_keyringlacks a__init
annotation or the annotation ofset_platform_trusted_keysis wrong.
Quoted 7 lines
Indeed, if the compiler decides not to inline
__integrity_init_keyring(), a warning is issued.Fix this by adding the missing
__initannotation.Fixes 9dc92c45177ab70e ("integrity: Define a trusted platform keyring")Signed-off-by Geert Uytterhoeven <[email protected]>
Signature · 2 lines
James Morris <[email protected]>