Re: [PATCH 030/190] Revert "ASoC: tegra: Fix reference count leaks."
From: Greg Kroah-Hartman
Date: Tue Apr 27 2021 - 12:28:07 EST
On Wed, Apr 21, 2021 at 02:58:25PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit deca195383a6085be62cb453079e03e04d618d6e.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
>
> Cc: Qiushi Wu <wu000273@xxxxxxx>
> Cc: Jon Hunter <jonathanh@xxxxxxxxxx>
> Cc: https
> Cc: Mark Brown <broonie@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/tegra/tegra30_ahub.c | 4 +---
> sound/soc/tegra/tegra30_i2s.c | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
> index 9ef05ca4f6c4..b116b05e4e72 100644
> --- a/sound/soc/tegra/tegra30_ahub.c
> +++ b/sound/soc/tegra/tegra30_ahub.c
> @@ -657,10 +657,8 @@ static int tegra30_ahub_resume(struct device *dev)
> int ret;
>
> ret = pm_runtime_get_sync(dev);
> - if (ret < 0) {
> - pm_runtime_put(dev);
> + if (ret < 0)
> 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 6740df541508..3187a0f0c07a 100644
> --- a/sound/soc/tegra/tegra30_i2s.c
> +++ b/sound/soc/tegra/tegra30_i2s.c
> @@ -567,10 +567,8 @@ static int tegra30_i2s_resume(struct device *dev)
> int ret;
>
> ret = pm_runtime_get_sync(dev);
> - if (ret < 0) {
> - pm_runtime_put(dev);
> + if (ret < 0)
> return ret;
> - }
> ret = regcache_sync(i2s->regmap);
> pm_runtime_put(dev);
>
> --
> 2.31.1
>
Looks correct, dropping.
greg k-h