Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp416623pxa; Fri, 21 Aug 2020 10:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtlTO2ReWEs4fuaAx6HSdWy07/+fYB3/sEY3OfTm2a4ledkIT3YoBnChcWpShYxozFILUd X-Received: by 2002:a17:906:393:: with SMTP id b19mr2929519eja.268.1598031040831; Fri, 21 Aug 2020 10:30:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598031040; cv=none; d=google.com; s=arc-20160816; b=Ru/WHCCKqTGIBqepqA9n/X124fsrZQU7mnCc2+4ayoHLcZVJvDK2Cn8Wt2OyI7XJA3 udY1EGJ+G9vPLTWy8XvNEyDOjanVORwXaDjmKhwq46vPPuh9dHRSixrgyjFJyL3fUO0D 9BzgV8aUX1dKtqvK0AppKBw08ql0x5JEE7Kw8/xvtIXyRXJZVVJvVKr0b8wU21MQeim/ L5zx0dP4M2HoBkDYZ6nlRCGoT7geW4w5oJvpbpY64xfHyPdptpM7DN/8g7veEbyc1dF5 kms7aKxSkpa2KpAgsk+ikd6FCH3e4Zk2RZRQHq19iVWKgUoE03/ekY67QHDTCUy0mWVe PqYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NZZ5zh+6iPd3ssR7S85EMXwf4yl9rI8aMY9NAeDP0aw=; b=G725CycewBlfDLt5Ljs1XUMPtkGoStr6/v/BlwTgO7z1bneCXul6Pk2KzKF8JK9tcK vRBOme7HMF8SiDFqKhW4hpj30+hLzm1Plat3x+YpdYseGTuGSC6GSfH8sCMOMEcFYJ1/ qnFAHd4rdlFKyMFh0tR/Hjr0uQN+cFWoF7Qpl+zkZoWrStnOVIxSMNt2T0MRUmboHpJ3 IaiCsx0tqJ2K5ViCABfr4oFOxUleJDUgOf9cqNesQ9kHJ/jfX5Opb8T8VKXQEbYtEnYv Ebzt3PqOU35vP/cMjl2LI2HFzMI49OQcFyUWXNqP8duU88NUnjXWiqS8O9VcXihx5dRC zc0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BX30BvcM; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn10si1694687ejc.547.2020.08.21.10.30.18; Fri, 21 Aug 2020 10:30:40 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=BX30BvcM; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbgHUR25 (ORCPT + 99 others); Fri, 21 Aug 2020 13:28:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:46612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbgHUQOn (ORCPT ); Fri, 21 Aug 2020 12:14:43 -0400 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 E8F3322B4B; Fri, 21 Aug 2020 16:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026475; bh=gWohrytgPPCufu0Y0SdUetLBz+Kc3A0G8R2gLyGeer8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BX30BvcMviD5aaJBOaw1W6vcKLChTMHU3rDuM9TswtEPglj+waUKL21hm3FSKv0kM R8SGaJsyrqtCI1zkTLsBSx95946XVkKwBSBEq8qvNZYYDnCXYdvNTL0T5vzXdd05nC 9q/PoYXnFNLQuRT4U53O6J0G40S/nxHofZUzIqyk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Jon Hunter , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 09/62] ASoC: tegra: Fix reference count leaks. Date: Fri, 21 Aug 2020 12:13:30 -0400 Message-Id: <20200821161423.347071-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-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: Qiushi Wu [ Upstream commit deca195383a6085be62cb453079e03e04d618d6e ] Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put is not called in error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails. Signed-off-by: Qiushi Wu Reviewed-by: Jon Hunter Link: https://lore.kernel.org/r/20200613204422.24484-1-wu000273@umn.edu Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/tegra/tegra30_ahub.c | 4 +++- sound/soc/tegra/tegra30_i2s.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index 635eacbd28d47..156e3b9d613c6 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c @@ -643,8 +643,10 @@ static int tegra30_ahub_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } ret = regcache_sync(ahub->regmap_ahub); ret |= regcache_sync(ahub->regmap_apbif); pm_runtime_put(dev); diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index d59882ec48f16..db5a8587bfa4c 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -567,8 +567,10 @@ static int tegra30_i2s_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } ret = regcache_sync(i2s->regmap); pm_runtime_put(dev); -- 2.25.1