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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BCE3C433EF for ; Thu, 7 Apr 2022 01:14:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236566AbiDGBQr (ORCPT ); Wed, 6 Apr 2022 21:16:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236515AbiDGBPv (ORCPT ); Wed, 6 Apr 2022 21:15:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23D9818F23F; Wed, 6 Apr 2022 18:12:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D88E0B8268B; Thu, 7 Apr 2022 01:12:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A275C385A6; Thu, 7 Apr 2022 01:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649293921; bh=AbRLW6KpKD4tIN4tfMldWC0Y7qjHWvaSMDBU+t7g3Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PID9sYRsUmqsq2arzi+5mQnEshNgjc6DHUO0XZy7DDUrGCZ2iLGAIIOUjDm4F2Hdk 5DZlukckzvbPgVdcu03/NfnljoxA4kKMo5u7cFaaQV58z9gJvg7QPf/Pdxe4WYWFyJ 6RdjRtUrLPQwK+Xhm7gNlPmjkkQ0SOXcODMBV/NlA1tupoji+XJFbUj26/eHSxP7Kj YTC0Fie+vEBfWs79hI8PXLaPdteQyh0OrRTqSyAs+doiwJotGra6iF7EhemyIx3vEF sxU/+ZAFJ3L90lzLeq2tCB8yw0KvNmZxz5uipq8jzNi+pxHtZQ/Xy8RmOT/DWd7Klk GvfS3T4ci6rJA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Yongjun , Dmitry Torokhov , Sasha Levin , mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.16 10/30] Input: stmfts - fix reference leak in stmfts_input_open Date: Wed, 6 Apr 2022 21:11:20 -0400 Message-Id: <20220407011140.113856-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407011140.113856-1-sashal@kernel.org> References: <20220407011140.113856-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheng Yongjun [ Upstream commit 26623eea0da3476446909af96c980768df07bbd9 ] pm_runtime_get_sync() will increment pm usage counter even it failed. Forgetting to call pm_runtime_put_noidle will result in reference leak in stmfts_input_open, so we should fix it. Signed-off-by: Zheng Yongjun Link: https://lore.kernel.org/r/20220317131604.53538-1-zhengyongjun3@huawei.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/touchscreen/stmfts.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c index bc11203c9cf7..72e0b767e1ba 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -339,11 +339,11 @@ static int stmfts_input_open(struct input_dev *dev) err = pm_runtime_get_sync(&sdata->client->dev); if (err < 0) - return err; + goto out; err = i2c_smbus_write_byte(sdata->client, STMFTS_MS_MT_SENSE_ON); if (err) - return err; + goto out; mutex_lock(&sdata->mutex); sdata->running = true; @@ -366,7 +366,9 @@ static int stmfts_input_open(struct input_dev *dev) "failed to enable touchkey\n"); } - return 0; +out: + pm_runtime_put_noidle(&sdata->client->dev); + return err; } static void stmfts_input_close(struct input_dev *dev) -- 2.35.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EAA16C433F5 for ; Thu, 7 Apr 2022 01:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2tuUAdBaNsPLJ07NlfB8X2BOdsq+wwlCXJwSKFqIhL4=; b=Z6xVCkNPF5KvKV ZLhABT7WgPhMEGFAASECl5ZvnJHXh8rpkHQ3mEfIJMY/pGqg6Oeb6DqRLhArzjlnlms0xHu0LjpeB BqID7Tqpb5iobwLDDO9chkmeGPvafeQCgDIxB7rII6VWBiDSVjdm0MD4FNm8I2t84IoI3cgKxtdhp qQkhXgfvLc8Il/byKAKkF2z8a25BLNhDME1HXjzdm/qDqAH1AiWrmz+hZMR0ivqlpgqFjUdwmqbpk MXu/XWDNP0jKBU3q+L3RbN2Gci+Vmou+L9PAbKwq8naELsLz81O/6zpcwxnU9Q6r9dvjccg0d3F+U rQLfSmmyXSBCbXuuG+tw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncGh8-008UnR-Lx; Thu, 07 Apr 2022 01:12:19 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncGgu-008Ue6-5M for linux-arm-kernel@lists.infradead.org; Thu, 07 Apr 2022 01:12:05 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D591FB8268A; Thu, 7 Apr 2022 01:12:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A275C385A6; Thu, 7 Apr 2022 01:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649293921; bh=AbRLW6KpKD4tIN4tfMldWC0Y7qjHWvaSMDBU+t7g3Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PID9sYRsUmqsq2arzi+5mQnEshNgjc6DHUO0XZy7DDUrGCZ2iLGAIIOUjDm4F2Hdk 5DZlukckzvbPgVdcu03/NfnljoxA4kKMo5u7cFaaQV58z9gJvg7QPf/Pdxe4WYWFyJ 6RdjRtUrLPQwK+Xhm7gNlPmjkkQ0SOXcODMBV/NlA1tupoji+XJFbUj26/eHSxP7Kj YTC0Fie+vEBfWs79hI8PXLaPdteQyh0OrRTqSyAs+doiwJotGra6iF7EhemyIx3vEF sxU/+ZAFJ3L90lzLeq2tCB8yw0KvNmZxz5uipq8jzNi+pxHtZQ/Xy8RmOT/DWd7Klk GvfS3T4ci6rJA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Yongjun , Dmitry Torokhov , Sasha Levin , mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.16 10/30] Input: stmfts - fix reference leak in stmfts_input_open Date: Wed, 6 Apr 2022 21:11:20 -0400 Message-Id: <20220407011140.113856-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407011140.113856-1-sashal@kernel.org> References: <20220407011140.113856-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220406_181204_365163_73FAC706 X-CRM114-Status: GOOD ( 12.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Zheng Yongjun [ Upstream commit 26623eea0da3476446909af96c980768df07bbd9 ] pm_runtime_get_sync() will increment pm usage counter even it failed. Forgetting to call pm_runtime_put_noidle will result in reference leak in stmfts_input_open, so we should fix it. Signed-off-by: Zheng Yongjun Link: https://lore.kernel.org/r/20220317131604.53538-1-zhengyongjun3@huawei.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/touchscreen/stmfts.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c index bc11203c9cf7..72e0b767e1ba 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -339,11 +339,11 @@ static int stmfts_input_open(struct input_dev *dev) err = pm_runtime_get_sync(&sdata->client->dev); if (err < 0) - return err; + goto out; err = i2c_smbus_write_byte(sdata->client, STMFTS_MS_MT_SENSE_ON); if (err) - return err; + goto out; mutex_lock(&sdata->mutex); sdata->running = true; @@ -366,7 +366,9 @@ static int stmfts_input_open(struct input_dev *dev) "failed to enable touchkey\n"); } - return 0; +out: + pm_runtime_put_noidle(&sdata->client->dev); + return err; } static void stmfts_input_close(struct input_dev *dev) -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel