[PATCH v6 02/43] drm/vkms: Lock the config dump against concurrent configfs changes

From: Louis Chauvet

Date: Fri Nov 20 2026 - 13:02:23 EST


The vkms_config debugfs dump iterates the configuration lists while
configfs can concurrently mutate or free them, which leads to a
use-after-free. Move the configuration lock into struct vkms_config and
run the dump under it.

Fixes: 13fc9b9745cc ("drm/vkms: Add and remove VKMS instances via configfs")
Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_config.c | 10 +++++++
drivers/gpu/drm/vkms/vkms_config.h | 4 +++
drivers/gpu/drm/vkms/vkms_configfs.c | 54 +++++++++++++++++-------------------
3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c
index 48c60930302f..71877651cb00 100644
--- a/drivers/gpu/drm/vkms/vkms_config.c
+++ b/drivers/gpu/drm/vkms/vkms_config.c
@@ -27,6 +27,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);
+ mutex_init(&config->lock);

return config;
}
@@ -130,6 +131,7 @@ void vkms_config_destroy(struct vkms_config *config)
list_for_each_entry_safe(connector_cfg, connector_tmp, &config->connectors, link)
vkms_config_destroy_connector(connector_cfg);

+ mutex_destroy(&config->lock);
kfree_const(config->dev_name);
kfree(config);
}
@@ -347,6 +349,14 @@ static int vkms_config_show(struct seq_file *m, void *data)
struct vkms_config_crtc *crtc_cfg;
struct vkms_config_encoder *encoder_cfg;
struct vkms_config_connector *connector_cfg;
+ struct vkms_config *config = (struct vkms_config *)vkmsdev->config;
+
+ /*
+ * The configuration lists and fields are concurrently mutated by
+ * configfs (creation, removal, attribute stores); iterate under the
+ * configuration lock to keep the iteration coherent.
+ */
+ guard(mutex)(&config->lock);

dev_name = vkms_config_get_device_name((struct vkms_config *)vkmsdev->config);
seq_printf(m, "dev_name=%s\n", dev_name);
diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h
index 56805b0c9b14..10604f7f37e1 100644
--- a/drivers/gpu/drm/vkms/vkms_config.h
+++ b/drivers/gpu/drm/vkms/vkms_config.h
@@ -4,6 +4,7 @@
#define _VKMS_CONFIG_H_

#include <linux/list.h>
+#include <linux/mutex.h>
#include <linux/types.h>
#include <linux/xarray.h>

@@ -19,6 +20,8 @@
* @crtcs: List of CRTCs configured for the device
* @encoders: List of encoders configured for the device
* @connectors: List of connectors configured for the device
+ * @lock: Protects the whole configuration (lists and item fields) against
+ * concurrent access from the configfs, debugfs and DRM paths
* @dev: Used to store the current VKMS device. Only set when the device is instantiated.
*/
struct vkms_config {
@@ -27,6 +30,7 @@ struct vkms_config {
struct list_head crtcs;
struct list_head encoders;
struct list_head connectors;
+ struct mutex lock;
struct vkms_device *dev;
};

diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vkms_configfs.c
index 601e3f128c9f..707cf3578e2d 100644
--- a/drivers/gpu/drm/vkms/vkms_configfs.c
+++ b/drivers/gpu/drm/vkms/vkms_configfs.c
@@ -21,10 +21,9 @@ static bool is_configfs_registered;
* @crtcs_group: Default subgroup of @group at "/config/vkms/crtcs"
* @encoders_group: Default subgroup of @group at "/config/vkms/encoders"
* @connectors_group: Default subgroup of @group at "/config/vkms/connectors"
- * @lock: Lock used to project concurrent access to the configuration attributes
- * @config: Protected by @lock. Configuration of the VKMS device
- * @enabled: Protected by @lock. The device is created or destroyed when this
- * option changes
+ * @config: Configuration of the VKMS device. Its @lock field protects it
+ * against concurrent access
+ * @enabled: The device is created or destroyed when this option changes
*/
struct vkms_configfs_device {
struct config_group group;
@@ -33,7 +32,6 @@ struct vkms_configfs_device {
struct config_group encoders_group;
struct config_group connectors_group;

- struct mutex lock;
struct vkms_config *config;
bool enabled;
};
@@ -141,7 +139,7 @@ static ssize_t crtc_writeback_show(struct config_item *item, char *page)

crtc = crtc_item_to_vkms_configfs_crtc(item);

- scoped_guard(mutex, &crtc->dev->lock)
+ scoped_guard(mutex, &crtc->dev->config->lock)
writeback = vkms_config_crtc_get_writeback(crtc->config);

return sprintf(page, "%d\n", writeback);
@@ -158,7 +156,7 @@ static ssize_t crtc_writeback_store(struct config_item *item, const char *page,
if (kstrtobool(page, &writeback))
return -EINVAL;

- scoped_guard(mutex, &crtc->dev->lock) {
+ scoped_guard(mutex, &crtc->dev->config->lock) {
if (crtc->dev->enabled)
return -EBUSY;

@@ -181,7 +179,7 @@ static void crtc_release(struct config_item *item)
struct mutex *lock;

crtc = crtc_item_to_vkms_configfs_crtc(item);
- lock = &crtc->dev->lock;
+ lock = &crtc->dev->config->lock;

scoped_guard(mutex, lock) {
vkms_config_destroy_crtc(crtc->dev->config, crtc->config);
@@ -208,7 +206,7 @@ static struct config_group *make_crtc_group(struct config_group *group,

dev = child_group_to_vkms_configfs_device(group);

- scoped_guard(mutex, &dev->lock) {
+ scoped_guard(mutex, &dev->config->lock) {
if (dev->enabled)
return ERR_PTR(-EBUSY);

@@ -253,7 +251,7 @@ static int plane_possible_crtcs_allow_link(struct config_item *src,
plane = plane_possible_crtcs_item_to_vkms_configfs_plane(src);
crtc = crtc_item_to_vkms_configfs_crtc(target);

- scoped_guard(mutex, &plane->dev->lock) {
+ scoped_guard(mutex, &plane->dev->config->lock) {
if (plane->dev->enabled)
return -EBUSY;

@@ -272,7 +270,7 @@ static void plane_possible_crtcs_drop_link(struct config_item *src,
plane = plane_possible_crtcs_item_to_vkms_configfs_plane(src);
crtc = crtc_item_to_vkms_configfs_crtc(target);

- scoped_guard(mutex, &plane->dev->lock)
+ scoped_guard(mutex, &plane->dev->config->lock)
vkms_config_plane_detach_crtc(plane->config, crtc->config);
}

@@ -293,7 +291,7 @@ static ssize_t plane_type_show(struct config_item *item, char *page)

plane = plane_item_to_vkms_configfs_plane(item);

- scoped_guard(mutex, &plane->dev->lock)
+ scoped_guard(mutex, &plane->dev->config->lock)
type = vkms_config_plane_get_type(plane->config);

return sprintf(page, "%u", type);
@@ -314,7 +312,7 @@ static ssize_t plane_type_store(struct config_item *item, const char *page,
type != DRM_PLANE_TYPE_CURSOR)
return -EINVAL;

- scoped_guard(mutex, &plane->dev->lock) {
+ scoped_guard(mutex, &plane->dev->config->lock) {
if (plane->dev->enabled)
return -EBUSY;

@@ -337,7 +335,7 @@ static void plane_release(struct config_item *item)
struct mutex *lock;

plane = plane_item_to_vkms_configfs_plane(item);
- lock = &plane->dev->lock;
+ lock = &plane->dev->config->lock;

scoped_guard(mutex, lock) {
vkms_config_destroy_plane(plane->config);
@@ -364,7 +362,7 @@ static struct config_group *make_plane_group(struct config_group *group,

dev = child_group_to_vkms_configfs_device(group);

- scoped_guard(mutex, &dev->lock) {
+ scoped_guard(mutex, &dev->config->lock) {
if (dev->enabled)
return ERR_PTR(-EBUSY);

@@ -415,7 +413,7 @@ static int encoder_possible_crtcs_allow_link(struct config_item *src,
encoder = encoder_possible_crtcs_item_to_vkms_configfs_encoder(src);
crtc = crtc_item_to_vkms_configfs_crtc(target);

- scoped_guard(mutex, &encoder->dev->lock) {
+ scoped_guard(mutex, &encoder->dev->config->lock) {
if (encoder->dev->enabled)
return -EBUSY;

@@ -434,7 +432,7 @@ static void encoder_possible_crtcs_drop_link(struct config_item *src,
encoder = encoder_possible_crtcs_item_to_vkms_configfs_encoder(src);
crtc = crtc_item_to_vkms_configfs_crtc(target);

- scoped_guard(mutex, &encoder->dev->lock)
+ scoped_guard(mutex, &encoder->dev->config->lock)
vkms_config_encoder_detach_crtc(encoder->config, crtc->config);
}

@@ -454,7 +452,7 @@ static void encoder_release(struct config_item *item)
struct mutex *lock;

encoder = encoder_item_to_vkms_configfs_encoder(item);
- lock = &encoder->dev->lock;
+ lock = &encoder->dev->config->lock;

scoped_guard(mutex, lock) {
vkms_config_destroy_encoder(encoder->dev->config, encoder->config);
@@ -480,7 +478,7 @@ static struct config_group *make_encoder_group(struct config_group *group,

dev = child_group_to_vkms_configfs_device(group);

- scoped_guard(mutex, &dev->lock) {
+ scoped_guard(mutex, &dev->config->lock) {
if (dev->enabled)
return ERR_PTR(-EBUSY);

@@ -526,7 +524,7 @@ static ssize_t connector_status_show(struct config_item *item, char *page)

connector = connector_item_to_vkms_configfs_connector(item);

- scoped_guard(mutex, &connector->dev->lock)
+ scoped_guard(mutex, &connector->dev->config->lock)
status = vkms_config_connector_get_status(connector->config);

return sprintf(page, "%u", status);
@@ -548,7 +546,7 @@ static ssize_t connector_status_store(struct config_item *item,
status != connector_status_unknown)
return -EINVAL;

- scoped_guard(mutex, &connector->dev->lock) {
+ scoped_guard(mutex, &connector->dev->config->lock) {
vkms_config_connector_set_status(connector->config, status);

if (connector->dev->enabled)
@@ -571,7 +569,7 @@ static void connector_release(struct config_item *item)
struct mutex *lock;

connector = connector_item_to_vkms_configfs_connector(item);
- lock = &connector->dev->lock;
+ lock = &connector->dev->config->lock;

scoped_guard(mutex, lock) {
vkms_config_destroy_connector(connector->config);
@@ -602,7 +600,7 @@ static int connector_possible_encoders_allow_link(struct config_item *src,
connector = connector_possible_encoders_item_to_vkms_configfs_connector(src);
encoder = encoder_item_to_vkms_configfs_encoder(target);

- scoped_guard(mutex, &connector->dev->lock) {
+ scoped_guard(mutex, &connector->dev->config->lock) {
if (connector->dev->enabled)
return -EBUSY;

@@ -622,7 +620,7 @@ static void connector_possible_encoders_drop_link(struct config_item *src,
connector = connector_possible_encoders_item_to_vkms_configfs_connector(src);
encoder = encoder_item_to_vkms_configfs_encoder(target);

- scoped_guard(mutex, &connector->dev->lock) {
+ scoped_guard(mutex, &connector->dev->config->lock) {
vkms_config_connector_detach_encoder(connector->config,
encoder->config);
}
@@ -647,7 +645,7 @@ static struct config_group *make_connector_group(struct config_group *group,

dev = child_group_to_vkms_configfs_device(group);

- scoped_guard(mutex, &dev->lock) {
+ scoped_guard(mutex, &dev->config->lock) {
if (dev->enabled)
return ERR_PTR(-EBUSY);

@@ -693,7 +691,7 @@ static ssize_t device_enabled_show(struct config_item *item, char *page)

dev = device_item_to_vkms_configfs_device(item);

- scoped_guard(mutex, &dev->lock)
+ scoped_guard(mutex, &dev->config->lock)
enabled = dev->enabled;

return sprintf(page, "%d\n", enabled);
@@ -711,7 +709,7 @@ static ssize_t device_enabled_store(struct config_item *item, const char *page,
if (kstrtobool(page, &enabled))
return -EINVAL;

- scoped_guard(mutex, &dev->lock) {
+ scoped_guard(mutex, &dev->config->lock) {
if (!dev->enabled && enabled) {
if (!vkms_config_is_valid(dev->config))
return -EINVAL;
@@ -745,7 +743,6 @@ static void device_release(struct config_item *item)
if (dev->enabled)
vkms_destroy(dev->config);

- mutex_destroy(&dev->lock);
vkms_config_destroy(dev->config);
kfree(dev);
}
@@ -781,7 +778,6 @@ static struct config_group *make_device_group(struct config_group *group,
}

config_group_init_type_name(&dev->group, name, &device_item_type);
- mutex_init(&dev->lock);

config_group_init_type_name(&dev->planes_group, "planes",
&plane_group_type);

--
2.56.0