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=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 96F7DC432C0 for ; Fri, 22 Nov 2019 06:07:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E2AE2068F for ; Fri, 22 Nov 2019 06:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402822; bh=ugYxtUEhfaxxCeJcLPhxQolv4YrUrUZ2A46DJSr1QSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rWm6eEu8Qy1G7ERmx/s2iPrSGjoNRP3ssO3nIAZNIFtc5noo2JA+25yIQd8UHkoNj rBdEKrXJ4nsXd1veSIg4p1RKfb1xGgS+oHhXK+lNZ7Ey7ykp/eYXHCVMHTkHdOIFtR 1wBsFVM/fzQdBtqVrrInUgpmBPxJKn3ttaOdKhSw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729486AbfKVGHB (ORCPT ); Fri, 22 Nov 2019 01:07:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:40720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729633AbfKVGCM (ORCPT ); Fri, 22 Nov 2019 01:02:12 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 E991C20659; Fri, 22 Nov 2019 06:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402531; bh=ugYxtUEhfaxxCeJcLPhxQolv4YrUrUZ2A46DJSr1QSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFzFCWs5dW0dYb9yprih8+3QYXbgPm4npTJJqF9fcIRLBCl1ZKhvQohGOuRJKnQPc jCw6sjVQEyE5jWqOMtXVnVOkuGCwJ7wGFzVPFCX0hzRGRHyTvqWjl2Dd3QaQ16V5tF xIHyCUrnFNPIYtsJY/HlrL5hIZy+MNsQux5xXG5I= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Mark Brown , Sasha Levin , linux-omap@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 39/91] drivers/regulator: fix a missing check of return value Date: Fri, 22 Nov 2019 01:00:37 -0500 Message-Id: <20191122060129.4239-38-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122060129.4239-1-sashal@kernel.org> References: <20191122060129.4239-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: Kangjie Lu [ Upstream commit 966e927bf8cc6a44f8b72582a1d6d3ffc73b12ad ] If palmas_smps_read() fails, we should not use the read data in "reg" which may contain random value. The fix inserts a check for the return value of palmas_smps_read(): If it fails, we return the error code upstream and stop using "reg". Signed-off-by: Kangjie Lu Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/palmas-regulator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index f11d41dad9c13..1eb605b6f0492 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -435,13 +435,16 @@ static int palmas_ldo_write(struct palmas *palmas, unsigned int reg, static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode) { int id = rdev_get_id(dev); + int ret; struct palmas_pmic *pmic = rdev_get_drvdata(dev); struct palmas_pmic_driver_data *ddata = pmic->palmas->pmic_ddata; struct palmas_regs_info *rinfo = &ddata->palmas_regs_info[id]; unsigned int reg; bool rail_enable = true; - palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, ®); + ret = palmas_smps_read(pmic->palmas, rinfo->ctrl_addr, ®); + if (ret) + return ret; reg &= ~PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; -- 2.20.1