lkml.org 
[lkml]   [2019]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 14/52] ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized
    Date
    From: Yizhuo <yzhai003@ucr.edu>

    [ Upstream commit dc30e70391376ba3987aeb856ae6d9c0706534f1 ]

    In function omap4_dsi_mux_pads(), local variable "reg" could
    be uninitialized if function regmap_read() returns -EINVAL.
    However, it will be used directly in the later context, which
    is potentially unsafe.

    Signed-off-by: Yizhuo <yzhai003@ucr.edu>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap2/display.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
    index f86b72d1d59e..1444b4b4bd9f 100644
    --- a/arch/arm/mach-omap2/display.c
    +++ b/arch/arm/mach-omap2/display.c
    @@ -83,6 +83,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
    u32 enable_mask, enable_shift;
    u32 pipd_mask, pipd_shift;
    u32 reg;
    + int ret;

    if (dsi_id == 0) {
    enable_mask = OMAP4_DSI1_LANEENABLE_MASK;
    @@ -98,7 +99,11 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
    return -ENODEV;
    }

    - regmap_read(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, &reg);
    + ret = regmap_read(omap4_dsi_mux_syscon,
    + OMAP4_DSIPHY_SYSCON_OFFSET,
    + &reg);
    + if (ret)
    + return ret;

    reg &= ~enable_mask;
    reg &= ~pipd_mask;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-11 21:13    [W:2.845 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site