lkml.org 
[lkml]   [2022]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 215/240] certs/blacklist_hashes.c: fix const confusion in certs blacklist
    Date
    From: Masahiro Yamada <masahiroy@kernel.org>

    [ Upstream commit 6a1c3767d82ed8233de1263aa7da81595e176087 ]

    This file fails to compile as follows:

    CC certs/blacklist_hashes.o
    certs/blacklist_hashes.c:4:1: error: ignoring attribute ‘section (".init.data")’ because it conflicts with previous ‘section (".init.rodata")’ [-Werror=attributes]
    4 | const char __initdata *const blacklist_hashes[] = {
    | ^~~~~
    In file included from certs/blacklist_hashes.c:2:
    certs/blacklist.h:5:38: note: previous declaration here
    5 | extern const char __initconst *const blacklist_hashes[];
    | ^~~~~~~~~~~~~~~~

    Apply the same fix as commit 2be04df5668d ("certs/blacklist_nohashes.c:
    fix const confusion in certs blacklist").

    Fixes: 734114f8782f ("KEYS: Add a system blacklist keyring")
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
    Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
    Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    certs/blacklist_hashes.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/certs/blacklist_hashes.c b/certs/blacklist_hashes.c
    index 344892337be0..d5961aa3d338 100644
    --- a/certs/blacklist_hashes.c
    +++ b/certs/blacklist_hashes.c
    @@ -1,7 +1,7 @@
    // SPDX-License-Identifier: GPL-2.0
    #include "blacklist.h"

    -const char __initdata *const blacklist_hashes[] = {
    +const char __initconst *const blacklist_hashes[] = {
    #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST
    , NULL
    };
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-20 16:06    [W:2.540 / U:0.888 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site