lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 246/563] powerpc/prom_init: Fix improper check of prom_getprop()
    Date
    From: Peiwei Hu <jlu.hpw@foxmail.com>

    [ Upstream commit 869fb7e5aecbc163003f93f36dcc26d0554319f6 ]

    prom_getprop() can return PROM_ERROR. Binary operator can not identify
    it.

    Fixes: 94d2dde738a5 ("[POWERPC] Efika: prune fixups and make them more carefull")
    Signed-off-by: Peiwei Hu <jlu.hpw@foxmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/tencent_BA28CC6897B7C95A92EB8C580B5D18589105@qq.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/prom_init.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
    index 7e337c570ea6b..9e71c0739f08d 100644
    --- a/arch/powerpc/kernel/prom_init.c
    +++ b/arch/powerpc/kernel/prom_init.c
    @@ -2956,7 +2956,7 @@ static void __init fixup_device_tree_efika_add_phy(void)

    /* Check if the phy-handle property exists - bail if it does */
    rv = prom_getprop(node, "phy-handle", prop, sizeof(prop));
    - if (!rv)
    + if (rv <= 0)
    return;

    /*
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:40    [W:4.026 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site