[022/190] Revert "drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync"
diff mbox series

Message ID 20210421130105.1226686-23-gregkh@linuxfoundation.org
State New, archived
Headers show
Series
  • Revertion of all of the umn.edu commits
Related show

Commit Message

Greg KH April 21, 2021, 12:58 p.m. UTC
This reverts commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63.

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: Evan Quan <evan.quan@amd.com>
Cc: Aditya Pakki <pakki001@umn.edu>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/gpu/drm/radeon/radeon_display.c | 4 +---
 drivers/gpu/drm/radeon/radeon_drv.c     | 4 +---
 drivers/gpu/drm/radeon/radeon_kms.c     | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

Comments

Deucher, Alexander April 21, 2021, 4:08 p.m. UTC | #1
[AMD Public Use]

> -----Original Message-----
> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Sent: Wednesday, April 21, 2021 8:58 AM
> To: linux-kernel@vger.kernel.org
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Quan, Evan
> <Evan.Quan@amd.com>; Aditya Pakki <pakki001@umn.edu>; Deucher,
> Alexander <Alexander.Deucher@amd.com>
> Subject: [PATCH 022/190] Revert "drm/radeon: Fix reference count leaks
> caused by pm_runtime_get_sync"
> 
> This reverts commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63.
> 
> 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: Evan Quan <evan.quan@amd.com>
> Cc: Aditya Pakki <pakki001@umn.edu>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

AFAICT, this patch is correct or at least does no harm.  Handling of pm_runtime_get_sync() errors in the kernel seems to be inconsistent at best.

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_display.c | 4 +---
>  drivers/gpu/drm/radeon/radeon_drv.c     | 4 +---
>  drivers/gpu/drm/radeon/radeon_kms.c     | 4 +---
>  3 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c
> b/drivers/gpu/drm/radeon/radeon_display.c
> index 652af7a134bd..9f29ba6c2bed 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -627,10 +627,8 @@ radeon_crtc_set_config(struct drm_mode_set *set,
>  	dev = set->crtc->dev;
> 
>  	ret = pm_runtime_get_sync(dev->dev);
> -	if (ret < 0) {
> -		pm_runtime_put_autosuspend(dev->dev);
> +	if (ret < 0)
>  		return ret;
> -	}
> 
>  	ret = drm_crtc_helper_set_config(set, ctx);
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c
> b/drivers/gpu/drm/radeon/radeon_drv.c
> index efeb115ae70e..468b364c2dab 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -513,10 +513,8 @@ long radeon_drm_ioctl(struct file *filp,
>  	long ret;
>  	dev = file_priv->minor->dev;
>  	ret = pm_runtime_get_sync(dev->dev);
> -	if (ret < 0) {
> -		pm_runtime_put_autosuspend(dev->dev);
> +	if (ret < 0)
>  		return ret;
> -	}
> 
>  	ret = drm_ioctl(filp, cmd, arg);
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c
> b/drivers/gpu/drm/radeon/radeon_kms.c
> index 2479d6ab7a36..df644bb68c0f 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -644,10 +644,8 @@ int radeon_driver_open_kms(struct drm_device
> *dev, struct drm_file *file_priv)
>  	file_priv->driver_priv = NULL;
> 
>  	r = pm_runtime_get_sync(dev->dev);
> -	if (r < 0) {
> -		pm_runtime_put_autosuspend(dev->dev);
> +	if (r < 0)
>  		return r;
> -	}
> 
>  	/* new gpu have virtual address space support */
>  	if (rdev->family >= CHIP_CAYMAN) {
> --
> 2.31.1
Greg KH April 27, 2021, 1:40 p.m. UTC | #2
On Wed, Apr 21, 2021 at 04:08:05PM +0000, Deucher, Alexander wrote:
> [AMD Public Use]
> 
> > -----Original Message-----
> > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Sent: Wednesday, April 21, 2021 8:58 AM
> > To: linux-kernel@vger.kernel.org
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Quan, Evan
> > <Evan.Quan@amd.com>; Aditya Pakki <pakki001@umn.edu>; Deucher,
> > Alexander <Alexander.Deucher@amd.com>
> > Subject: [PATCH 022/190] Revert "drm/radeon: Fix reference count leaks
> > caused by pm_runtime_get_sync"
> > 
> > This reverts commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63.
> > 
> > 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: Evan Quan <evan.quan@amd.com>
> > Cc: Aditya Pakki <pakki001@umn.edu>
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> AFAICT, this patch is correct or at least does no harm.  Handling of pm_runtime_get_sync() errors in the kernel seems to be inconsistent at best.

Thanks for the review, I'll drop this revert from the tree.

greg k-h

Patch
diff mbox series

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 652af7a134bd..9f29ba6c2bed 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -627,10 +627,8 @@  radeon_crtc_set_config(struct drm_mode_set *set,
 	dev = set->crtc->dev;
 
 	ret = pm_runtime_get_sync(dev->dev);
-	if (ret < 0) {
-		pm_runtime_put_autosuspend(dev->dev);
+	if (ret < 0)
 		return ret;
-	}
 
 	ret = drm_crtc_helper_set_config(set, ctx);
 
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index efeb115ae70e..468b364c2dab 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -513,10 +513,8 @@  long radeon_drm_ioctl(struct file *filp,
 	long ret;
 	dev = file_priv->minor->dev;
 	ret = pm_runtime_get_sync(dev->dev);
-	if (ret < 0) {
-		pm_runtime_put_autosuspend(dev->dev);
+	if (ret < 0)
 		return ret;
-	}
 
 	ret = drm_ioctl(filp, cmd, arg);
 
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 2479d6ab7a36..df644bb68c0f 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -644,10 +644,8 @@  int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
 	file_priv->driver_priv = NULL;
 
 	r = pm_runtime_get_sync(dev->dev);
-	if (r < 0) {
-		pm_runtime_put_autosuspend(dev->dev);
+	if (r < 0)
 		return r;
-	}
 
 	/* new gpu have virtual address space support */
 	if (rdev->family >= CHIP_CAYMAN) {