Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp408348pxu; Tue, 1 Dec 2020 14:31:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlsAaem5+7RwTPg+/PTiYQz1gaUk3mDHQMJAnL60y5ZzOvi7JixRyY7jz3dzR0X9Td+a0Q X-Received: by 2002:a17:906:5c43:: with SMTP id c3mr5343744ejr.390.1606861884018; Tue, 01 Dec 2020 14:31:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606861884; cv=none; d=google.com; s=arc-20160816; b=LjKw/j15+Mhp9gZ7CBzj2ip453pzwcyIXbKkW1Ik5ESplGHbh2Fuk2SOp0ihF74OOh uHKE78/cK4dU3cRdpnr4rzm6A57dUm/YDukNxqQk6DXhV8aKebLQ7zpcuqDpjixMBC8J RvQVTTRPpTQEhGYm6VEAq1bViE2H57//QINB5m+n5WKdkmlI/9eyHx8+MwN1ueAkxi43 RmvVY2tdyIP0TqEz9l2RFz8LiJYpigjIbgRhxct5KjIGrJD3O6zfmSK90gPvtboe5ozR A9QTZKLnhr/bV7C79hpCnfj1f/7Y2f1fK/ObcX5irjf1WzJHOS2ACtAEHBE6VXTsDKAe i8kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZylbH/wHdRzY5z5AVBohLGGGnPbcbPrTYtcL4lxCDHU=; b=iRQI7I1rcWiRhsbdjM1adxKE4bmzx8FS60Msa2EUtUeDbXpfEzfAFeloBqVTYiyMjP M36RED+JsC3bwHcYBTIYE0rT4xg9f6vYignxGpZHBlNl5mZvwKoff9UwrOUV4qC02s4b Mm99E9HdDSZ9y1oDJlUMsIQavTyIBVLzapRQx3rfqMriJJhlg+YAXhqIPPBMin87I/+9 3/bbjWYhb0Qo/nblS1UOdLor+QhkJWnqiemRQcZSjpQvCrk7P0CdIXESNQW3PY87dw99 a67q9kblIBW6FFs1gh2/To+5pGY9wKp/YCP0+wwnHwhPbqnXYlCNi5ol7ujnMV+ZszbQ +gLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j7si709367eje.191.2020.12.01.14.31.01; Tue, 01 Dec 2020 14:31:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390884AbgLAJYw (ORCPT + 99 others); Tue, 1 Dec 2020 04:24:52 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:8478 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390839AbgLAJYf (ORCPT ); Tue, 1 Dec 2020 04:24:35 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Clc914QZJzhXtc; Tue, 1 Dec 2020 17:23:33 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 17:23:46 +0800 From: Qinglang Miao To: Pierre-Yves MORDRET , Maxime Coquelin , Alexandre Torgue CC: , , , , Qinglang Miao Subject: [PATCH 7/8] i2c: stm32f7: fix reference leak when pm_runtime_get_sync fails Date: Tue, 1 Dec 2020 17:31:45 +0800 Message-ID: <20201201093145.113270-1-miaoqinglang@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201201092924.112461-1-miaoqinglang@huawei.com> References: <20201201092924.112461-1-miaoqinglang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PM reference count is not expected to be incremented on return in these stm32f7_i2c_xx serious functions. However, pm_runtime_get_sync will increment the PM reference count even failed. Forgetting to putting operation will result in a reference leak here. Replace it with pm_runtime_resume_and_get to keep usage counter balanced. Fixes: ea6dd25deeb5 ("i2c: stm32f7: add PM_SLEEP suspend/resume support") Reported-by: Hulk Robot Signed-off-by: Qinglang Miao --- drivers/i2c/busses/i2c-stm32f7.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index f41f51a17..72fd5bdd6 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -1643,7 +1643,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap, i2c_dev->msg_id = 0; f7_msg->smbus = false; - ret = pm_runtime_get_sync(i2c_dev->dev); + ret = pm_runtime_resume_and_get(i2c_dev->dev); if (ret < 0) return ret; @@ -1689,7 +1689,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, f7_msg->read_write = read_write; f7_msg->smbus = true; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; @@ -1790,7 +1790,7 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave) if (ret) return ret; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; @@ -1871,7 +1871,7 @@ static int stm32f7_i2c_unreg_slave(struct i2c_client *slave) WARN_ON(!i2c_dev->slave[id]); - ret = pm_runtime_get_sync(i2c_dev->dev); + ret = pm_runtime_resume_and_get(i2c_dev->dev); if (ret < 0) return ret; @@ -2268,7 +2268,7 @@ static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev) int ret; struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs; - ret = pm_runtime_get_sync(i2c_dev->dev); + ret = pm_runtime_resume_and_get(i2c_dev->dev); if (ret < 0) return ret; @@ -2290,7 +2290,7 @@ static int stm32f7_i2c_regs_restore(struct stm32f7_i2c_dev *i2c_dev) int ret; struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs; - ret = pm_runtime_get_sync(i2c_dev->dev); + ret = pm_runtime_resume_and_get(i2c_dev->dev); if (ret < 0) return ret; -- 2.23.0