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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 9B197C43381 for ; Mon, 25 Feb 2019 21:29:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DFE0217F5 for ; Mon, 25 Feb 2019 21:29:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130183; bh=cKL7T6M+rD69d8CmhKfYszD5rKPG1qDa1WQ813Ez0c8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MHX33kIPl5VkYaqRoq7RMWYa5sQXfOK8ktTCEqT2yFCgH20wJBjW8kfW4OZNz98g5 YEjdW8qeXW50ji4xTmTqZsSw8PfYXiScpQN4MKglCb7rQA0EwzZa90ra+SliNZwTfI HenjLQZb9C+UydlEieWU1iFWtoXw3Z7xQ0uKEOp4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731563AbfBYV3l (ORCPT ); Mon, 25 Feb 2019 16:29:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:35360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730469AbfBYV3h (ORCPT ); Mon, 25 Feb 2019 16:29:37 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 2713F217F9; Mon, 25 Feb 2019 21:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130176; bh=cKL7T6M+rD69d8CmhKfYszD5rKPG1qDa1WQ813Ez0c8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FAoorfoBYdMLl17kUh9eyhIk76fEf48QOe8PxIsWquRjc50bJtfPd6+QOwNnVrDox /q4t7L1zHa/6LHEj6Ccm3SQZ0gqYDehdbyLgxzZ/FnzPA8DxAG6jxpbIHkVMudDi6W x6m1aO9kY6GrrnYjSwY/lVQ+No94kj3kw+Qsk8nU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Lee Jones , Sasha Levin Subject: [PATCH 4.20 038/183] mfd: mc13xxx: Fix a missing check of a register-read failure Date: Mon, 25 Feb 2019 22:10:11 +0100 Message-Id: <20190225195101.078229480@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 9e28989d41c0eab57ec0bb156617a8757406ff8a ] When mc13xxx_reg_read() fails, "old_adc0" is uninitialized and will contain random value. Further execution uses "old_adc0" even when mc13xxx_reg_read() fails. The fix checks the return value of mc13xxx_reg_read(), and exits the execution when it fails. Signed-off-by: Kangjie Lu Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/mc13xxx-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index f475e848252fa..d0bf50e3568d7 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c @@ -274,7 +274,9 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, mc13xxx->adcflags |= MC13XXX_ADC_WORKING; - mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0); + ret = mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0); + if (ret) + goto out; adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2 | MC13XXX_ADC0_CHRGRAWDIV; -- 2.19.1