Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2438234ybg; Sun, 27 Oct 2019 18:36:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvG/Qd02ytDqdmuCbENkV1Zdnog/Czk1yRb+1BNHUntSFJ7/iF0VysHsybm2OAJ0HWaKlF X-Received: by 2002:a17:906:f252:: with SMTP id gy18mr14572421ejb.224.1572226565409; Sun, 27 Oct 2019 18:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572226565; cv=none; d=google.com; s=arc-20160816; b=KO1ELotno5veJn7FxaLWzQX5Fz6J86Tv0KQlRPQM+p+R/app1QEViZF0DkxC08FNfH KKI3wUh3spVhPxblWs0Z2a4lpREvB3aWqd7eZjHCkHTDNDHk4sWb2zembh91ub5BhowI RviFO1ZzfY2QOLZCoF4TSGdzskbPVJs3iKibdo6gq/C7aLqkijOoVP4xLdaBS7hmMGp2 5U5P3H2sLqnDA7uxGTk2KsA9CJ92E7qvMV8FfVPh5CrEaKh1Bgu4oRrVJWLPVom+JxMh 4onmPyPDCLab4aBZEWQv8HQXAMwhJVd+HKdhhne2mtlFlAHLofJoPemGNCbXwgmmPy/M GktQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C2A14pMtYEb9tBPrT+05H0wAZtT0tc/EC98nopCxZaU=; b=KIgm0FgercqTPS9+TqOGXI+mFBsAeK8XKepcx9toTZ+gFl2bWIjJSd9aIeucKaG/7d ShlX6Z+PXP9fzk7TEGD3rpzQV8NANxFsGP9OtlPyDF8h+W/zihm/KjBSOUwLAvkv8DFF jVikRRqyOGU1LrkKAro8llQm03cIeizeBOt6H+PSfSOaTceVB65w2Epjrt6RWx9u6p6w pcZuFVU7vpTXRCyzyIyQtWPR6I5RwObdbmkjvrbAAx1DAY2r1VzqcxNuNOtF5iSrBTpJ LQlTXWAqwPZ0TVpI61okirnxmRq5m0i9h/6jujPyrd+6Y5RjZwvjCkfLqrX5cXlUWj+M pNBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0LnF7LkO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v10si6689811edc.62.2019.10.27.18.35.00; Sun, 27 Oct 2019 18:36:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0LnF7LkO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728130AbfJ0VHS (ORCPT + 99 others); Sun, 27 Oct 2019 17:07:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728037AbfJ0VHL (ORCPT ); Sun, 27 Oct 2019 17:07:11 -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 A122B214E0; Sun, 27 Oct 2019 21:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210431; bh=KSTyBycvaBF6MzT0NdhfrBGaaI+TnTsiPM3uavlCd/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0LnF7LkO4HKOLQgiKX+QISUEY9w19Q0RVGRWU+RtkYPbxG7CsxYeauZM5DesWdm/k 0KwnBm7kuirbTDRi10L+tuntE9h2cPH4cyUuxa0e4tC1ktbuNt5F24Ssa6dC7VfF8Z 9MH2WR/4WbiYQnugEvO2CGwS9ZJX+ylFmG8T0aeY= 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 4.14 013/119] net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() Date: Sun, 27 Oct 2019 21:59:50 +0100 Message-Id: <20191027203303.152336287@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203259.948006506@linuxfoundation.org> References: <20191027203259.948006506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 baf5cc251f329..9a3bc0994a1db 100644 --- a/drivers/net/ethernet/hisilicon/hns_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns_mdio.c @@ -156,11 +156,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