lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 179/261] ima: Remove __init annotation from ima_pcrread()
    Date
    From: Roberto Sassu <roberto.sassu@huawei.com>

    commit 8b8c704d913b0fe490af370631a4200e26334ec0 upstream.

    Commit 6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in
    ima_eventdigest_init()") added a call to ima_calc_boot_aggregate() so that
    the digest can be recalculated for the boot_aggregate measurement entry if
    the 'd' template field has been requested. For the 'd' field, only SHA1 and
    MD5 digests are accepted.

    Given that ima_eventdigest_init() does not have the __init annotation, all
    functions called should not have it. This patch removes __init from
    ima_pcrread().

    Cc: stable@vger.kernel.org
    Fixes: 6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()")
    Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    security/integrity/ima/ima_crypto.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/security/integrity/ima/ima_crypto.c
    +++ b/security/integrity/ima/ima_crypto.c
    @@ -645,7 +645,7 @@ int ima_calc_buffer_hash(const void *buf
    return calc_buffer_shash(buf, len, hash);
    }

    -static void __init ima_pcrread(u32 idx, struct tpm_digest *d)
    +static void ima_pcrread(u32 idx, struct tpm_digest *d)
    {
    if (!ima_tpm_chip)
    return;

    \
     
     \ /
      Last update: 2020-06-19 17:15    [W:2.612 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site