lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0817/1157] KVM: arm64: Fix hypervisor address symbolization
    Date
    From: Kalesh Singh <kaleshsingh@google.com>

    [ Upstream commit ed6313a93fd11d2015ad17046f3c418bf6a8dab1 ]

    With CONFIG_RANDOMIZE_BASE=y vmlinux addresses will resolve incorrectly
    from kallsyms. Fix this by adding the KASLR offset before printing the
    symbols.

    Fixes: 6ccf9cb557bd ("KVM: arm64: Symbolize the nVHE HYP addresses")
    Reported-by: Fuad Tabba <tabba@google.com>
    Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Link: https://lore.kernel.org/r/20220715235824.2549012-1-kaleshsingh@google.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/kvm/handle_exit.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
    index f66c0142b335..e43926ef2bc2 100644
    --- a/arch/arm64/kvm/handle_exit.c
    +++ b/arch/arm64/kvm/handle_exit.c
    @@ -347,10 +347,10 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,
    kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line);
    else
    kvm_err("nVHE hyp BUG at: [<%016llx>] %pB!\n", panic_addr,
    - (void *)panic_addr);
    + (void *)(panic_addr + kaslr_offset()));
    } else {
    kvm_err("nVHE hyp panic at: [<%016llx>] %pB!\n", panic_addr,
    - (void *)panic_addr);
    + (void *)(panic_addr + kaslr_offset()));
    }

    /*
    --
    2.35.1


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