lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 147/274] arm64: kexec_file: print appropriate variable
    Date
    From: Łukasz Stelmach <l.stelmach@samsung.com>

    [ Upstream commit 51075e0cb759a736e60ab4f3a5fed8670dba5852 ]

    The value of kbuf->memsz may be different than kbuf->bufsz after calling
    kexec_add_buffer(). Hence both values should be logged.

    Fixes: 52b2a8af74360 ("arm64: kexec_file: load initrd and device-tree")
    Fixes: 3751e728cef29 ("arm64: kexec_file: add crash dump support")
    Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
    Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
    Cc: James Morse <james.morse@arm.com>
    Cc: Bhupesh Sharma <bhsharma@redhat.com>
    Link: https://lore.kernel.org/r/20200430163142.27282-2-l.stelmach@samsung.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/kernel/machine_kexec_file.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
    index b40c3b0def92..5ebb21b859b4 100644
    --- a/arch/arm64/kernel/machine_kexec_file.c
    +++ b/arch/arm64/kernel/machine_kexec_file.c
    @@ -284,7 +284,7 @@ int load_other_segments(struct kimage *image,
    image->arch.elf_headers_sz = headers_sz;

    pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
    - image->arch.elf_headers_mem, headers_sz, headers_sz);
    + image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
    }

    /* load initrd */
    @@ -305,7 +305,7 @@ int load_other_segments(struct kimage *image,
    initrd_load_addr = kbuf.mem;

    pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
    - initrd_load_addr, initrd_len, initrd_len);
    + initrd_load_addr, kbuf.bufsz, kbuf.memsz);
    }

    /* load dtb */
    @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
    image->arch.dtb_mem = kbuf.mem;

    pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
    - kbuf.mem, dtb_len, dtb_len);
    + kbuf.mem, kbuf.bufsz, kbuf.memsz);

    return 0;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:55    [W:3.754 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site