From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A63F4CA9EBC for ; Sun, 27 Oct 2019 21:30:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74634208C0 for ; Sun, 27 Oct 2019 21:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211817; bh=HCYxVJDMn2BwZ6tKnFHJdI0Ik6H89eRSiO+FbcLH2wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lqwlwNQCDZIluWfW8ND8YTDNBCoGTULq4AhK8tf2p5J7pCtOhAWpvXSkvu14Kosn8 ZnOgc6wJgNahZSvLYXCoWv5TRe9NQVOYaICAkjbmA2a5nRaTqxrR6wE/3hfcawYZmN IdVw76u6wkFRLxamY4q48517xW7adWkyrkhAJcxk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730934AbfJ0VaQ (ORCPT ); Sun, 27 Oct 2019 17:30:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:39400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731390AbfJ0VTE (ORCPT ); Sun, 27 Oct 2019 17:19:04 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D2BA21848; Sun, 27 Oct 2019 21:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211143; bh=HCYxVJDMn2BwZ6tKnFHJdI0Ik6H89eRSiO+FbcLH2wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vlNHvomBx/fIz2ef9OI4fAbQvVQHLoNGdl23G3ZH+RvrJe9pwDpXgoX8Zd6OHhBZn czt/jQ60lWs7ImsTjOm+tsTW1RpDXXLRM1jvs1z0Eio40XwuBc0K7L8cD79tscrsbI 1x4bMs/D30zlY1aXTzxujj/KN4rRY+uhRZlgmJy4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yizhuo , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 048/197] net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() Date: Sun, 27 Oct 2019 21:59:26 +0100 Message-Id: <20191027203354.290448834@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yizhuo [ Upstream commit 53de429f4e88f538f7a8ec2b18be8c0cd9b2c8e1 ] In function mdio_sc_cfg_reg_write(), variable "reg_value" could be uninitialized if regmap_read() fails. However, "reg_value" is used to decide the control flow later in the if statement, which is potentially unsafe. Signed-off-by: Yizhuo Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns_mdio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c index 3e863a71c5136..7df5d7d211d47 100644 --- a/drivers/net/ethernet/hisilicon/hns_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns_mdio.c @@ -148,11 +148,15 @@ static int mdio_sc_cfg_reg_write(struct hns_mdio_device *mdio_dev, { u32 time_cnt; u32 reg_value; + int ret; regmap_write(mdio_dev->subctrl_vbase, cfg_reg, set_val); for (time_cnt = MDIO_TIMEOUT; time_cnt; time_cnt--) { - regmap_read(mdio_dev->subctrl_vbase, st_reg, ®_value); + ret = regmap_read(mdio_dev->subctrl_vbase, st_reg, ®_value); + if (ret) + return ret; + reg_value &= st_msk; if ((!!check_st) == (!!reg_value)) break; -- 2.20.1