lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 150/775] x86/sgx: Fix the return type of sgx_init()
    Date
    From: Sami Tolvanen <samitolvanen@google.com>

    [ Upstream commit 31bf92881714fe9962d43d097b5114a9b4ad0a12 ]

    device_initcall() expects a function of type initcall_t, which returns
    an integer. Change the signature of sgx_init() to match.

    Fixes: e7e0545299d8c ("x86/sgx: Initialize metadata for Enclave Page Cache (EPC) sections")
    Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
    Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
    Link: https://lkml.kernel.org/r/20210113232311.277302-1-samitolvanen@google.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/cpu/sgx/main.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
    index c519fc5f69480..8df81a3ed9457 100644
    --- a/arch/x86/kernel/cpu/sgx/main.c
    +++ b/arch/x86/kernel/cpu/sgx/main.c
    @@ -700,25 +700,27 @@ static bool __init sgx_page_cache_init(void)
    return true;
    }

    -static void __init sgx_init(void)
    +static int __init sgx_init(void)
    {
    int ret;
    int i;

    if (!cpu_feature_enabled(X86_FEATURE_SGX))
    - return;
    + return -ENODEV;

    if (!sgx_page_cache_init())
    - return;
    + return -ENOMEM;

    - if (!sgx_page_reclaimer_init())
    + if (!sgx_page_reclaimer_init()) {
    + ret = -ENOMEM;
    goto err_page_cache;
    + }

    ret = sgx_drv_init();
    if (ret)
    goto err_kthread;

    - return;
    + return 0;

    err_kthread:
    kthread_stop(ksgxd_tsk);
    @@ -728,6 +730,8 @@ err_page_cache:
    vfree(sgx_epc_sections[i].pages);
    memunmap(sgx_epc_sections[i].virt_addr);
    }
    +
    + return ret;
    }

    device_initcall(sgx_init);
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 03:10    [W:4.958 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site