lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 149/164] of/fdt: fix error checking for earlycon address
    Date
    3.19.8-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Masahiro Yamada <yamada.masahiro@socionext.com>

    commit 3f5ceec96470050d20d7281d49985e3b1cfc3995 upstream.

    fdt_translate_address() returns OF_BAD_ADDR on error. It is defined as
    a u64 value, so the variable "addr" should be defined as u64 as well.

    Fixes: fb11ffe74c79 ("of/fdt: add FDT serial scanning for earlycon")
    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/of/fdt.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
    index 5100742..0159b48 100644
    --- a/drivers/of/fdt.c
    +++ b/drivers/of/fdt.c
    @@ -788,14 +788,15 @@ int __init early_init_dt_scan_chosen_serial(void)
    return -ENODEV;

    while (match->compatible[0]) {
    - unsigned long addr;
    + u64 addr;
    +
    if (fdt_node_check_compatible(fdt, offset, match->compatible)) {
    match++;
    continue;
    }

    addr = fdt_translate_address(fdt, offset);
    - if (!addr)
    + if (addr == OF_BAD_ADDR)
    return -ENXIO;

    of_setup_earlycon(addr, match->data);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-02 18:21    [W:2.481 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site