Re: [PATCH 017/190] Revert "drm/nouveau: fix reference count leak in nv50_disp_atomic_commit"

Greg Kroah-Hartman
2021-04-27T16:25:31Z

On Wed, Apr 21, 2021 at 02:58:12PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit a2cdf39536b0d21fb06113f5e16692513d7bcb9c.
>
> 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: Aditya Pakki <pakki001@umn.edu>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 1c9c0cdf85db..8ae298ab1cfb 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -2320,10 +2320,8 @@ nv50_disp_atomic_commit(struct drm_device *dev,
> int ret, i;
>
> ret = pm_runtime_get_sync(dev->dev);
> - if (ret < 0 && ret != -EACCES) {
> - pm_runtime_put_autosuspend(dev->dev);
> + if (ret < 0 && ret != -EACCES)
> return ret;
> - }
>
> ret = drm_atomic_helper_setup_commit(state, nonblock);
> if (ret)
> --
> 2.31.1
>

Looks correct, dropping this.

greg k-h