Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2256646ybg; Sun, 27 Oct 2019 14:32:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqw9GXkbFvNV7IHP/XILNKshNM1kBQbk7e9/6cPRQFkHkgHqj3/Frd1DA0LwIL7u0J8tLAX1 X-Received: by 2002:a50:eacc:: with SMTP id u12mr16269132edp.290.1572211925390; Sun, 27 Oct 2019 14:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211925; cv=none; d=google.com; s=arc-20160816; b=yMntjcuq8ivZlaGCsGNe9aqAHm7DFK2g1pHyGuwD2BpECqas5+GqiEYRORr6R4w4hb xxxFL7S1pPyG+nLvkP2Cs2466stEfjPMEVC0vO8+B15ZY+S+p5s+i3rJG2iUsJeZQgSt VK+wwBTzBIOrjnY387yc25VddtIs9PffOmeTBmHWPghQ50HVebnj9rNw+gah9KW3jnxB M0bX9JYCOQkmlKBvYirxxDTHiYnuQrsFvEhE85y2pe77OG+APaen9E7tqYVo4Cy0b8sU o0w01LC5XGp4IAZeTgeh4pJvcId+gyN7gUiWlbdMfNfWVJhQ/XtPAeEHmLggNWZ0kgOP btdQ== 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=Sa34oIqTjdCKIIV+Km/CtuSdN4BMaaCYLfs0JGjrC4Q=; b=kjB7cO7KnTQMGqhf1o86+Y0hiXKckiu6BzeeT+FQWUL7Xfu0zprcYP7s4iRopXNxnE Q5UC2fnZwlyMV3GmXXLfsmcZYNHWEZty46dG55OVj3oNV+8U2Y6cL7MNVEBDLtthGz7G AiTYdeqn514QBEMk80pi9dHQALZc7+HBQUlNAoiBqcaWtKTSXSfDHbUeOXpedB0JRJ9j gh7HEYyIlAZLf54ipw0pL/3N0lGvd2I23I4eFWj6xTftevHHnlujluMKFdrjJjrdWZho 7PqnMVwzQuYhck1aAKWo8zrG4ms3lKSjuaNWiF6BPA2i3dyLb6LOoe3Zz3qTx3c7kkS1 AzMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vlNHvomB; 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 r12si7893256edi.272.2019.10.27.14.31.42; Sun, 27 Oct 2019 14:32: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=vlNHvomB; 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 S1731851AbfJ0VaR (ORCPT + 99 others); Sun, 27 Oct 2019 17:30:17 -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: 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 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