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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0CA62C47404 for ; Wed, 9 Oct 2019 17:26:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0E0021924 for ; Wed, 9 Oct 2019 17:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641974; bh=rJpc/GW8OOqRXsrjaiIX1kdq+qgdelKGmq0A41L9ncI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pTqayzLRV4YTeMSVzJ3b/H4n9Z8nN4HVfBe/PfPhcFssDt2FXwKzcF6hFBbIIfH+5 OoVLIS9JuRNp0gQd8BdAbZzEJ1DHmcJKEEa12TowFYa/tlvflP/wqiUflUXi6G+izz Jp0eRoj9vxNYErSSJwTyPWzZXfluqcuqO5HiQGyM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732714AbfJIR0N (ORCPT ); Wed, 9 Oct 2019 13:26:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:49754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732462AbfJIRYr (ORCPT ); Wed, 9 Oct 2019 13:24:47 -0400 Received: from sasha-vm.mshome.net (unknown [167.220.2.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 339A121929; Wed, 9 Oct 2019 17:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641887; bh=rJpc/GW8OOqRXsrjaiIX1kdq+qgdelKGmq0A41L9ncI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tten3cK5ENc+UCbkFhdRjn5xH7lbh7Pp6i880r+k6bZwey/tbLCRWmJNQz+68JyKu dze/Sb8Lo5qY/atMDPwGpis58sA8qsVQifL6mY85GjRyjbKLP5Kw6gKxVjMuhTdKgg aTpB9cMfGYlYq6Ky0PyEZnwiilO8iYR07VIkXSFo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yizhuo , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 11/13] net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() Date: Wed, 9 Oct 2019 13:06:30 -0400 Message-Id: <20191009170635.536-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009170635.536-1-sashal@kernel.org> References: <20191009170635.536-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 de23a0ead5d76..d06efcd5f13b1 100644 --- a/drivers/net/ethernet/hisilicon/hns_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns_mdio.c @@ -166,11 +166,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