Re: [PATCH 019/190] Revert "drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open"

Greg Kroah-Hartman
2021-04-27T16:26:27Z

On Wed, Apr 21, 2021 at 02:58:14PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit bfad51c7633325b5d4b32444efe04329d53297b2.
>
> 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/nouveau_fbcon.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> index 4fc0fa696461..6f04e7402a76 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> @@ -189,10 +189,8 @@ nouveau_fbcon_open(struct fb_info *info, int user)
> struct nouveau_fbdev *fbcon = info->par;
> struct nouveau_drm *drm = nouveau_drm(fbcon->helper.dev);
> int ret = pm_runtime_get_sync(drm->dev->dev);
> - if (ret < 0 && ret != -EACCES) {
> - pm_runtime_put(drm->dev->dev);
> + if (ret < 0 && ret != -EACCES)
> return ret;
> - }
> return 0;
> }
>
> --
> 2.31.1
>

Looks correct, dropping this.

greg k-h