[PATCH v6 12/43] drm/vkms: Reference-count vkms_config and vkms_config_connector

From: Louis Chauvet

Date: Fri Nov 20 2026 - 13:03:58 EST


The configuration objects are referenced from places with independent
lifetimes: connectors keep a pointer to their vkms_config_connector, the
DRM device outlives the configfs view, and userspace can delete a
configfs directory while the device is still running. Freeing a
configuration when its configfs representation disappears can therefore
lead to use-after-free.

Add explicit get/put references to vkms_config and vkms_config_connector:
a configuration destroyed while still referenced is detached and kept
alive until its last reference is dropped.

Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_config.c | 88 +++++++++++++++++++++++++++++++++++---
drivers/gpu/drm/vkms/vkms_config.h | 41 +++++++++++++++++-
drivers/gpu/drm/vkms/vkms_drv.c | 7 ++-
3 files changed, 128 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c
index 71877651cb00..50cde689f482 100644
--- a/drivers/gpu/drm/vkms/vkms_config.c
+++ b/drivers/gpu/drm/vkms/vkms_config.c
@@ -9,6 +9,8 @@

#include "vkms_config.h"

+static void vkms_config_connector_release(struct kref *ref);
+
struct vkms_config *vkms_config_create(const char *dev_name)
{
struct vkms_config *config;
@@ -27,6 +29,7 @@ struct vkms_config *vkms_config_create(const char *dev_name)
INIT_LIST_HEAD(&config->crtcs);
INIT_LIST_HEAD(&config->encoders);
INIT_LIST_HEAD(&config->connectors);
+ kref_init(&config->refcnt);
mutex_init(&config->lock);

return config;
@@ -112,8 +115,9 @@ struct vkms_config *vkms_config_default_create(bool enable_cursor,
}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_default_create);

-void vkms_config_destroy(struct vkms_config *config)
+static void vkms_config_release(struct kref *ref)
{
+ struct vkms_config *config = container_of(ref, struct vkms_config, refcnt);
struct vkms_config_plane *plane_cfg, *plane_tmp;
struct vkms_config_crtc *crtc_cfg, *crtc_tmp;
struct vkms_config_encoder *encoder_cfg, *encoder_tmp;
@@ -128,13 +132,37 @@ void vkms_config_destroy(struct vkms_config *config)
list_for_each_entry_safe(encoder_cfg, encoder_tmp, &config->encoders, link)
vkms_config_destroy_encoder(config, encoder_cfg);

- list_for_each_entry_safe(connector_cfg, connector_tmp, &config->connectors, link)
- vkms_config_destroy_connector(connector_cfg);
+ list_for_each_entry_safe(connector_cfg, connector_tmp, &config->connectors, link) {
+ /*
+ * The configuration is already being released and cannot be
+ * pinned anymore: drop the initial reference directly. The
+ * connector is still linked, so its release only unlinks it
+ * without touching the configuration.
+ */
+ vkms_config_connector_put(connector_cfg);
+ }

mutex_destroy(&config->lock);
kfree_const(config->dev_name);
kfree(config);
}
+
+void vkms_config_get(struct vkms_config *config)
+{
+ kref_get(&config->refcnt);
+}
+EXPORT_SYMBOL_IF_KUNIT(vkms_config_get);
+
+void vkms_config_put(struct vkms_config *config)
+{
+ kref_put(&config->refcnt, vkms_config_release);
+}
+EXPORT_SYMBOL_IF_KUNIT(vkms_config_put);
+
+void vkms_config_destroy(struct vkms_config *config)
+{
+ vkms_config_put(config);
+}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_destroy);

static bool valid_plane_number(const struct vkms_config *config)
@@ -610,6 +638,7 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c
connector_cfg->config = config;
connector_cfg->status = connector_status_connected;
xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC);
+ kref_init(&connector_cfg->refcnt);

list_add_tail(&connector_cfg->link, &config->connectors);

@@ -617,12 +646,61 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c
}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_create_connector);

-void vkms_config_destroy_connector(struct vkms_config_connector *connector_cfg)
+static void vkms_config_connector_release(struct kref *ref)
{
+ struct vkms_config_connector *connector_cfg =
+ container_of(ref, struct vkms_config_connector, refcnt);
xa_destroy(&connector_cfg->possible_encoders);
- list_del(&connector_cfg->link);
+ if (list_empty(&connector_cfg->link)) {
+ /*
+ * The connector was detached from the configuration by
+ * vkms_config_destroy_connector() before its final put,
+ * and that call pinned the configuration to keep it alive
+ * while the connector still points to it; drop that
+ * reference now that the last connector reference is gone.
+ */
+ vkms_config_put(connector_cfg->config);
+ } else {
+ /*
+ * The configuration is already being released and cannot be
+ * pinned anymore: unlink the connector without touching the
+ * configuration.
+ */
+ list_del(&connector_cfg->link);
+ }
kfree(connector_cfg);
}
+
+struct vkms_config_connector *vkms_config_connector_get(struct vkms_config_connector *connector_cfg)
+{
+ kref_get(&connector_cfg->refcnt);
+ return connector_cfg;
+}
+EXPORT_SYMBOL_IF_KUNIT(vkms_config_connector_get);
+
+void vkms_config_connector_put(struct vkms_config_connector *connector_cfg)
+{
+ kref_put(&connector_cfg->refcnt, vkms_config_connector_release);
+}
+EXPORT_SYMBOL_IF_KUNIT(vkms_config_connector_put);
+
+void vkms_config_destroy_connector(struct vkms_config_connector *connector_cfg)
+{
+ /*
+ * Pin the configuration and detach the connector before dropping
+ * the initial reference: the release callback runs inside the put
+ * when it is the last one, and would otherwise mutate the
+ * configuration lists without holding config->lock, or free the
+ * configuration while this call and its configfs caller still use
+ * both. The pin is dropped again by the release when the connector
+ * dies here; if it survives, it keeps the configuration alive until
+ * the connector's final put.
+ */
+ vkms_config_get(connector_cfg->config);
+ list_del_init(&connector_cfg->link);
+
+ vkms_config_connector_put(connector_cfg);
+}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_destroy_connector);

int __must_check vkms_config_connector_attach_encoder(struct vkms_config_connector *connector_cfg,
diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h
index 10604f7f37e1..de6a89819daf 100644
--- a/drivers/gpu/drm/vkms/vkms_config.h
+++ b/drivers/gpu/drm/vkms/vkms_config.h
@@ -3,8 +3,12 @@
#ifndef _VKMS_CONFIG_H_
#define _VKMS_CONFIG_H_

-#include <linux/list.h>
+#include <linux/cleanup.h>
+#include <linux/kref.h>
#include <linux/mutex.h>
+#include <linux/rcupdate.h>
+#include <linux/string.h>
+#include <linux/list.h>
#include <linux/types.h>
#include <linux/xarray.h>

@@ -32,6 +36,7 @@ struct vkms_config {
struct list_head connectors;
struct mutex lock;
struct vkms_device *dev;
+ struct kref refcnt;
};

/**
@@ -122,6 +127,8 @@ struct vkms_config_connector {

/* Internal usage */
struct vkms_connector *connector;
+
+ struct kref refcnt;
};

/**
@@ -211,6 +218,23 @@ struct vkms_config *vkms_config_default_create(bool enable_cursor,
bool enable_overlay,
bool enable_plane_pipeline);

+/**
+ * vkms_config_get() - Acquire a reference to a VKMS configuration
+ * @config: vkms_config to acquire a reference to
+ */
+void vkms_config_get(struct vkms_config *config);
+
+/**
+ * vkms_config_put() - Release a reference to a VKMS configuration
+ * @config: vkms_config to release the reference from
+ *
+ * When the last reference is released, the configuration and all its
+ * sub-components are freed.
+ */
+void vkms_config_put(struct vkms_config *config);
+
+DEFINE_FREE(vkms_config_put, struct vkms_config *, if (_T) vkms_config_put(_T));
+
/**
* vkms_config_destroy() - Free a VKMS configuration
* @config: vkms_config to free
@@ -446,6 +470,21 @@ void vkms_config_encoder_detach_crtc(struct vkms_config_encoder *encoder_cfg,
*/
struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *config);

+/**
+ * vkms_config_connector_get() - Acquire a reference to a connector configuration
+ * @connector_cfg: Connector configuration to acquire a reference to
+ */
+struct vkms_config_connector *
+vkms_config_connector_get(struct vkms_config_connector *connector_cfg);
+
+/**
+ * vkms_config_connector_put() - Release a reference to a connector configuration
+ * @connector_cfg: Connector configuration to release the reference from
+ *
+ * When the last reference is released, the connector configuration is freed.
+ */
+void vkms_config_connector_put(struct vkms_config_connector *connector_cfg);
+
/**
* vkms_config_destroy_connector() - Remove and free a connector configuration
* @connector_cfg: Connector configuration to destroy
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index 5a640b531d88..64c75b038869 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -163,6 +163,9 @@ int vkms_create(struct vkms_config *config)
struct faux_device *fdev;
struct vkms_device *vkms_device;
const char *dev_name;
+ struct vkms_config *cfg __free(vkms_config_put) = config;
+
+ vkms_config_get(cfg);

dev_name = vkms_config_get_device_name(config);
fdev = faux_device_create(dev_name, NULL, NULL);
@@ -210,11 +213,11 @@ int vkms_create(struct vkms_config *config)
goto out_devres;

drm_client_setup(&vkms_device->drm, NULL);
-
return 0;

out_devres:
devres_release_group(&fdev->dev, NULL);
+ config->dev = NULL;
out_unregister:
faux_device_destroy(fdev);
return ret;
@@ -275,7 +278,7 @@ static void __exit vkms_exit(void)
return;

vkms_destroy(default_config);
- vkms_config_destroy(default_config);
+ vkms_config_put(default_config);
}

module_init(vkms_init);

--
2.56.0