All of lore.kernel.org
 help / color / mirror / Atom feed
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Takashi Iwai <tiwai@suse.de>,
	nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Borislav Petkov <bp@alien8.de>, Ben Skeggs <bskeggs@redhat.com>
Subject: [Nouveau] [PATCH] drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create
Date: Mon, 14 Aug 2023 16:49:32 +0200	[thread overview]
Message-ID: <20230814144933.3956959-1-kherbst@redhat.com> (raw)

We can't simply free the connector after calling drm_connector_init on it.
We need to clean up the drm side first.

It might not fix all regressions from 2b5d1c29f6c4 ("drm/nouveau/disp:
PIOR DP uses GPIO for HPD, not PMGR AUX interrupts"), but at least it
fixes a memory corruption in error handling related to that commit.

Link: https://lore.kernel.org/lkml/20230806213107.GFZNARG6moWpFuSJ9W@fat_crate.local/
Fixes: 95983aea8003 ("drm/nouveau/disp: add connector class")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_connector.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index a2e0033e8a260..622f6eb9a8bfd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1408,8 +1408,7 @@ nouveau_connector_create(struct drm_device *dev,
 		ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,
 				     &nv_connector->conn);
 		if (ret) {
-			kfree(nv_connector);
-			return ERR_PTR(ret);
+			goto drm_conn_err;
 		}
 
 		ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug",
@@ -1426,8 +1425,7 @@ nouveau_connector_create(struct drm_device *dev,
 			if (ret) {
 				nvif_event_dtor(&nv_connector->hpd);
 				nvif_conn_dtor(&nv_connector->conn);
-				kfree(nv_connector);
-				return ERR_PTR(ret);
+				goto drm_conn_err;
 			}
 		}
 	}
@@ -1475,4 +1473,9 @@ nouveau_connector_create(struct drm_device *dev,
 
 	drm_connector_register(connector);
 	return connector;
+
+drm_conn_err:
+	drm_connector_cleanup(connector);
+	kfree(nv_connector);
+	return ERR_PTR(ret);
 }
-- 
2.41.0


WARNING: multiple messages have this Message-ID (diff)
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Karol Herbst <kherbst@redhat.com>,
	nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Borislav Petkov <bp@alien8.de>, Ben Skeggs <bskeggs@redhat.com>
Subject: [PATCH] drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create
Date: Mon, 14 Aug 2023 16:49:32 +0200	[thread overview]
Message-ID: <20230814144933.3956959-1-kherbst@redhat.com> (raw)

We can't simply free the connector after calling drm_connector_init on it.
We need to clean up the drm side first.

It might not fix all regressions from 2b5d1c29f6c4 ("drm/nouveau/disp:
PIOR DP uses GPIO for HPD, not PMGR AUX interrupts"), but at least it
fixes a memory corruption in error handling related to that commit.

Link: https://lore.kernel.org/lkml/20230806213107.GFZNARG6moWpFuSJ9W@fat_crate.local/
Fixes: 95983aea8003 ("drm/nouveau/disp: add connector class")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_connector.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index a2e0033e8a260..622f6eb9a8bfd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1408,8 +1408,7 @@ nouveau_connector_create(struct drm_device *dev,
 		ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,
 				     &nv_connector->conn);
 		if (ret) {
-			kfree(nv_connector);
-			return ERR_PTR(ret);
+			goto drm_conn_err;
 		}
 
 		ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug",
@@ -1426,8 +1425,7 @@ nouveau_connector_create(struct drm_device *dev,
 			if (ret) {
 				nvif_event_dtor(&nv_connector->hpd);
 				nvif_conn_dtor(&nv_connector->conn);
-				kfree(nv_connector);
-				return ERR_PTR(ret);
+				goto drm_conn_err;
 			}
 		}
 	}
@@ -1475,4 +1473,9 @@ nouveau_connector_create(struct drm_device *dev,
 
 	drm_connector_register(connector);
 	return connector;
+
+drm_conn_err:
+	drm_connector_cleanup(connector);
+	kfree(nv_connector);
+	return ERR_PTR(ret);
 }
-- 
2.41.0


WARNING: multiple messages have this Message-ID (diff)
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Ben Skeggs <bskeggs@redhat.com>, Lyude Paul <lyude@redhat.com>,
	dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
	Borislav Petkov <bp@alien8.de>, Takashi Iwai <tiwai@suse.de>,
	Karol Herbst <kherbst@redhat.com>
Subject: [PATCH] drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create
Date: Mon, 14 Aug 2023 16:49:32 +0200	[thread overview]
Message-ID: <20230814144933.3956959-1-kherbst@redhat.com> (raw)

We can't simply free the connector after calling drm_connector_init on it.
We need to clean up the drm side first.

It might not fix all regressions from 2b5d1c29f6c4 ("drm/nouveau/disp:
PIOR DP uses GPIO for HPD, not PMGR AUX interrupts"), but at least it
fixes a memory corruption in error handling related to that commit.

Link: https://lore.kernel.org/lkml/20230806213107.GFZNARG6moWpFuSJ9W@fat_crate.local/
Fixes: 95983aea8003 ("drm/nouveau/disp: add connector class")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_connector.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index a2e0033e8a260..622f6eb9a8bfd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1408,8 +1408,7 @@ nouveau_connector_create(struct drm_device *dev,
 		ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,
 				     &nv_connector->conn);
 		if (ret) {
-			kfree(nv_connector);
-			return ERR_PTR(ret);
+			goto drm_conn_err;
 		}
 
 		ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug",
@@ -1426,8 +1425,7 @@ nouveau_connector_create(struct drm_device *dev,
 			if (ret) {
 				nvif_event_dtor(&nv_connector->hpd);
 				nvif_conn_dtor(&nv_connector->conn);
-				kfree(nv_connector);
-				return ERR_PTR(ret);
+				goto drm_conn_err;
 			}
 		}
 	}
@@ -1475,4 +1473,9 @@ nouveau_connector_create(struct drm_device *dev,
 
 	drm_connector_register(connector);
 	return connector;
+
+drm_conn_err:
+	drm_connector_cleanup(connector);
+	kfree(nv_connector);
+	return ERR_PTR(ret);
 }
-- 
2.41.0


             reply	other threads:[~2023-08-14 14:49 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14 14:49 Karol Herbst [this message]
2023-08-14 14:49 ` [PATCH] drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create Karol Herbst
2023-08-14 14:49 ` Karol Herbst
2023-08-16  9:30 ` Borislav Petkov
2023-08-16  9:30   ` Borislav Petkov
2023-08-16  9:30   ` [Nouveau] " Borislav Petkov
2023-08-16  9:51   ` Karol Herbst
2023-08-16  9:51     ` Karol Herbst
2023-08-16  9:51     ` Karol Herbst
2023-08-16 10:03     ` [Nouveau] " Borislav Petkov
2023-08-16 10:03       ` Borislav Petkov
2023-08-16 10:03       ` Borislav Petkov
2023-08-16 10:11       ` [Nouveau] " Borislav Petkov
2023-08-16 10:11         ` Borislav Petkov
2023-08-16 10:11         ` Borislav Petkov
2023-08-16 10:14         ` [Nouveau] " Borislav Petkov
2023-08-16 10:14           ` Borislav Petkov
2023-08-16 10:14           ` Borislav Petkov
2023-08-16 10:36           ` [Nouveau] " Takashi Iwai
2023-08-16 10:36             ` Takashi Iwai
2023-08-16 10:36             ` Takashi Iwai
2023-08-16 14:53     ` [Nouveau] " Borislav Petkov
2023-08-16 14:53       ` Borislav Petkov
2023-08-16 14:53       ` Borislav Petkov
2023-08-16 14:57       ` [Nouveau] " Karol Herbst
2023-08-16 14:57         ` Karol Herbst
2023-08-16 14:57         ` Karol Herbst
2023-08-16 15:12         ` [Nouveau] " Borislav Petkov
2023-08-16 15:12           ` Borislav Petkov
2023-08-16 15:12           ` Borislav Petkov
2023-08-16 21:27           ` [Nouveau] " Karol Herbst
2023-08-16 21:27             ` Karol Herbst
2023-08-16 21:27             ` Karol Herbst
2023-08-16 22:13             ` [Nouveau] " Borislav Petkov
2023-08-16 22:13               ` Borislav Petkov
2023-08-16 22:13               ` Borislav Petkov
2023-08-16 23:18               ` [Nouveau] " Karol Herbst
2023-08-16 23:18                 ` Karol Herbst
2023-08-16 23:18                 ` Karol Herbst
2023-08-17  8:10                 ` [Nouveau] " Borislav Petkov
2023-08-17  8:10                   ` Borislav Petkov
2023-08-17  8:10                   ` Borislav Petkov
2023-08-17  9:58                   ` [Nouveau] " Karol Herbst
2023-08-17  9:58                     ` Karol Herbst
2023-08-17  9:58                     ` Karol Herbst
2023-08-17 10:00                     ` [Nouveau] " Karol Herbst
2023-08-17 10:00                       ` Karol Herbst
2023-08-17 10:00                       ` Karol Herbst
2023-08-17 10:11                       ` [Nouveau] " Borislav Petkov
2023-08-17 10:11                         ` Borislav Petkov
2023-08-17 10:11                         ` Borislav Petkov
2023-08-17 10:24                         ` [Nouveau] " Karol Herbst
2023-08-17 10:24                           ` Karol Herbst
2023-08-17 10:24                           ` Karol Herbst
2023-08-17 15:17                           ` [Nouveau] " Borislav Petkov
2023-08-17 15:17                             ` Borislav Petkov
2023-08-17 15:17                             ` Borislav Petkov
2023-08-16 20:47 ` [Nouveau] " Lyude Paul
2023-08-16 20:47   ` Lyude Paul
2023-08-16 20:47   ` Lyude Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230814144933.3956959-1-kherbst@redhat.com \
    --to=kherbst@redhat.com \
    --cc=bp@alien8.de \
    --cc=bskeggs@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nouveau@lists.freedesktop.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.