lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 104/371] integrity: Fix __integrity_init_keyring() section mismatch
    Date
    [ 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@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>
    Signed-off-by: Sasha Levin <sashal@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 e19c2eb72c51..37869214c243 100644
    --- a/security/integrity/digsig.c
    +++ b/security/integrity/digsig.c
    @@ -73,8 +73,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;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-24 22:39    [W:3.144 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site