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,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 2D099C43381 for ; Fri, 22 Mar 2019 11:20:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3E6E2192D for ; Fri, 22 Mar 2019 11:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253639; bh=UZct7VyJzDkFhM1VunJ4xm0GSdqm4lPiY/9uB2+R3YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZiSD2sm7pHJxA3BR4D0S6RpCEocHg6qREGzHA7ycbhVRyv43AzNI78Xw11TxQWw9q l2tFU4XB96w7kN8c4k0LTN8d9Y4HP3qFsMOs1CUJLh6f6SO17bXYxhuscAKsTJBp6D HvUcyhkQTxLODq4tKrMImLH7Ty+Ec40R28ZfXC50= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728416AbfCVLUi (ORCPT ); Fri, 22 Mar 2019 07:20:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:46956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728378AbfCVLUf (ORCPT ); Fri, 22 Mar 2019 07:20:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 7D5B0218A2; Fri, 22 Mar 2019 11:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253635; bh=UZct7VyJzDkFhM1VunJ4xm0GSdqm4lPiY/9uB2+R3YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qc8Fg62JcX/tNNWCvZPoUedqC3XQyFrzNx+8Aslm9guY4acXnfst2l7thV4HJp3ER 3jC2hNlOTHCu0NG9Bkux0g7B8FNUAzsytOnj80Js7x90dtcpFLwz2621K45xBLpATj I3f8w+RTJAk8mLjTEmwqmlwf8CGnNDi0Hx6MM07Q= 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 3.18 009/134] mfd: mc13xxx: Fix a missing check of a register-read failure Date: Fri, 22 Mar 2019 12:13:42 +0100 Message-Id: <20190322111210.821552223@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@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 3.18-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 64dde5d24b320..b5c8e5fe6af6d 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; adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC; -- 2.19.1