Commit 1b254b79 authored by Karol Herbst's avatar Karol Herbst

drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create

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 commit 2b5d1c29
("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: 95983aea ("drm/nouveau/disp: add connector class")
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230814144933.3956959-1-kherbst@redhat.com
parent 96d3c1ca
...@@ -1408,8 +1408,7 @@ nouveau_connector_create(struct drm_device *dev, ...@@ -1408,8 +1408,7 @@ nouveau_connector_create(struct drm_device *dev,
ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index, ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,
&nv_connector->conn); &nv_connector->conn);
if (ret) { if (ret) {
kfree(nv_connector); goto drm_conn_err;
return ERR_PTR(ret);
} }
ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug", ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug",
...@@ -1426,8 +1425,7 @@ nouveau_connector_create(struct drm_device *dev, ...@@ -1426,8 +1425,7 @@ nouveau_connector_create(struct drm_device *dev,
if (ret) { if (ret) {
nvif_event_dtor(&nv_connector->hpd); nvif_event_dtor(&nv_connector->hpd);
nvif_conn_dtor(&nv_connector->conn); nvif_conn_dtor(&nv_connector->conn);
kfree(nv_connector); goto drm_conn_err;
return ERR_PTR(ret);
} }
} }
} }
...@@ -1475,4 +1473,9 @@ nouveau_connector_create(struct drm_device *dev, ...@@ -1475,4 +1473,9 @@ nouveau_connector_create(struct drm_device *dev,
drm_connector_register(connector); drm_connector_register(connector);
return connector; return connector;
drm_conn_err:
drm_connector_cleanup(connector);
kfree(nv_connector);
return ERR_PTR(ret);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment