lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0449/1017] KVM: PPC: Book3S HV: Check return value of kvmppc_radix_init
    Date
    From: Fabiano Rosas <farosas@linux.ibm.com>

    [ Upstream commit 69ab6ac380a00244575de02c406dcb9491bf3368 ]

    The return of the function is being shadowed by the call to
    kvmppc_uvmem_init.

    Fixes: ca9f4942670c ("KVM: PPC: Book3S HV: Support for running secure guests")
    Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
    Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20220125155735.1018683-2-farosas@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kvm/book3s_hv.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
    index a2fd1db29f7e..7fa685711669 100644
    --- a/arch/powerpc/kvm/book3s_hv.c
    +++ b/arch/powerpc/kvm/book3s_hv.c
    @@ -6101,8 +6101,11 @@ static int kvmppc_book3s_init_hv(void)
    if (r)
    return r;

    - if (kvmppc_radix_possible())
    + if (kvmppc_radix_possible()) {
    r = kvmppc_radix_init();
    + if (r)
    + return r;
    + }

    r = kvmppc_uvmem_init();
    if (r < 0)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:13    [W:2.661 / U:0.860 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site