lkml.org 
[lkml]   [2021]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 5/6] arm64: Free DTB buffer if fdt_open_into() fails
    Date
    create_dtb() function allocates memory for the device tree blob (DTB)
    and calls fdt_open_into(). If this call fails the memory allocated
    for the DTB is not freed before returning from create_dtb() thereby
    leaking memory.

    Call vfree() to free the memory allocated for the DTB if fdt_open_into()
    fails.

    Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
    Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
    Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
    Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
    ---
    arch/arm64/kernel/machine_kexec_file.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
    index 7da22bb7b9d5..2664b63bb118 100644
    --- a/arch/arm64/kernel/machine_kexec_file.c
    +++ b/arch/arm64/kernel/machine_kexec_file.c
    @@ -65,8 +65,10 @@ static int create_dtb(struct kimage *image,

    /* duplicate a device tree blob */
    ret = fdt_open_into(initial_boot_params, buf, buf_size);
    - if (ret)
    + if (ret) {
    + vfree(buf);
    return -EINVAL;
    + }

    ret = of_kexec_setup_new_fdt(image, buf, initrd_load_addr,
    initrd_len, cmdline);
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-04 20:29    [W:2.846 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site