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 1155/1157] powerpc/kexec: Fix build failure from uninitialised variable
    Date
    From: Russell Currey <ruscur@russell.cc>

    commit 83ee9f23763a432a4077bf20624ee35de87bce99 upstream.

    clang 14 won't build because ret is uninitialised and can be returned if
    both prop and fdtprop are NULL. Drop the ret variable and return an
    error in that failure case.

    Fixes: b1fc44eaa9ba ("pseries/iommu/ddw: Fix kdump to work in absence of ibm,dma-window")
    Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Signed-off-by: Russell Currey <ruscur@russell.cc>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20220810054331.373761-1-ruscur@russell.cc
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/kexec/file_load_64.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/arch/powerpc/kexec/file_load_64.c
    +++ b/arch/powerpc/kexec/file_load_64.c
    @@ -1043,17 +1043,17 @@ static int copy_property(void *fdt, int
    const char *propname)
    {
    const void *prop, *fdtprop;
    - int len = 0, fdtlen = 0, ret;
    + int len = 0, fdtlen = 0;

    prop = of_get_property(dn, propname, &len);
    fdtprop = fdt_getprop(fdt, node_offset, propname, &fdtlen);

    if (fdtprop && !prop)
    - ret = fdt_delprop(fdt, node_offset, propname);
    + return fdt_delprop(fdt, node_offset, propname);
    else if (prop)
    - ret = fdt_setprop(fdt, node_offset, propname, prop, len);
    -
    - return ret;
    + return fdt_setprop(fdt, node_offset, propname, prop, len);
    + else
    + return -FDT_ERR_NOTFOUND;
    }

    static int update_pci_dma_nodes(void *fdt, const char *dmapropname)

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