Skip to contentSkip to conversation

drm/gud: NUL-terminate TV mode names read from the device

PATCH Applied Deepanshu Kartikey 3 participants 6 messages Aug 16 – Aug 23

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/gud: NUL-terminate TV mode names read from the device

gud_connector_add_tv_mode() reads a buffer of fixed-size mode names from the USB device and passes pointers into it to drm_mode_create_tv_properties_legacy(), which calls strlen() on each one. Nothing guarantees the device NUL-terminates a name, so strlen() can run past the end of a slot and, for the last mode, past the end of the allocation.

Terminate each name at the end of its slot before use.

Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]
---
 drivers/gpu/drm/gud/gud_connector.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/gud/gud_connector.c +7 -2
index ea0cca58b7c8..5c0065c876a7 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);
 free:
Signature · 1 line
2.43.0
AI review Tested-by [email protected] on v1 1/1
#1 lore raw
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Pre-existing issues:
- [High] A malicious or misconfigured USB device can cause a NULL pointer dereference and kernel panic in drm_object_attach_property by returning GUD_PROPERTY_TV_MODE after any other non-margin TV property (such as GUD_PROPERTY_TV_BRIGHTNESS or GUD_PROPERTY_TV_HUE). --

--- Patch [1]: [PATCH] drm/gud: NUL-terminate TV mode names read from the device --- commit 789868bcbf6cc6ddf0d3b74feab3a22914863ec8
Author: Deepanshu Kartikey <[email protected]>

drm/gud: NUL-terminate TV mode names read from the device

This commit fixes a potential out-of-bounds read by explicitly NUL-terminating TV mode names read from the USB device. This ensures strlen() won't run past the end of the allocation when passed to drm_mode_create_tv_properties_legacy().

Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]
Quoted 9 lines
drivers/gpu/drm/gud/gud_connector.c +0 -1
index ea0cca58b7c89..5c0065c876a77 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)

drivers/gpu/drm/gud/gud_connector.c static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect · line 407

Quoted 10 lines
drivers/gpu/drm/gud/gud_connector.c +7 -1
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);

[Severity: High]
This is a pre-existing issue, but could a malicious or misconfigured USB device cause a NULL pointer dereference and kernel panic by returning GUD_PROPERTY_TV_MODE after another non-margin TV property?

In gud_connector_add_properties(), properties from the USB device are processed sequentially. If a property like GUD_PROPERTY_TV_BRIGHTNESS is processed first, drm_mode_create_tv_properties_legacy() creates the baseline TV properties but leaves legacy_tv_mode_property as NULL since num_modes is 0.

If GUD_PROPERTY_TV_MODE is processed next, it calls gud_connector_add_tv_mode() which then calls drm_mode_create_tv_properties_legacy() here:

drivers/gpu/drm/drm_connector.c:drm_mode_create_tv_properties_legacy() {
    ...
	if (dev->mode_config.tv_select_subconnector_property)
		return 0;
    ...
}

This early return prevents dev->mode_config.legacy_tv_mode_property from being created.

Then in gud_connector_add_properties(), gud_connector_property_lookup() will return NULL for legacy_tv_mode_property:

drivers/gpu/drm/gud/gud_connector.c:gud_connector_add_properties() {
    ...
		property = gud_connector_property_lookup(connector, prop);
		if (drm_WARN_ON(drm, IS_ERR(property)))
			continue;
    ...
}

Since IS_ERR() ignores NULL, the NULL property pointer bypasses this check and is passed to drm_object_attach_property(), which unconditionally dereferences it:

drivers/gpu/drm/drm_mode_object.c:drm_object_attach_property() {
    ...
	struct drm_device *dev = property->dev;
    ...
}

Could this lead to a local denial of service?

Quoted 3 lines
drivers/gpu/drm/gud/gud_connector.c +0 -0
 free:
drivers/gpu/drm/gud/gud_connector.c +0 -0
 	kfree(buf);
 	if (ret < 0)
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer
#2 lore raw
Quoted 62 lines · On Sun, 2026-08-16 at 09:00 +0000, [email protected] wrote:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Pre-existing issues:
- [High] A malicious or misconfigured USB device can cause a NULL pointer dereference and kernel panic in drm_object_attach_property by returning GUD_PROPERTY_TV_MODE after any other non-margin TV property (such as GUD_PROPERTY_TV_BRIGHTNESS or GUD_PROPERTY_TV_HUE). --

--- Patch [1]: [PATCH] drm/gud: NUL-terminate TV mode names read from the device --- commit 789868bcbf6cc6ddf0d3b74feab3a22914863ec8
Author: Deepanshu Kartikey <[email protected]>

drm/gud: NUL-terminate TV mode names read from the device

This commit fixes a potential out-of-bounds read by explicitly NUL-terminating TV mode names read from the USB device. This ensures strlen() won't run past the end of the allocation when passed to drm_mode_create_tv_properties_legacy().

Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]
Quoted 9 lines
drivers/gpu/drm/gud/gud_connector.c +0 -1
index ea0cca58b7c89..5c0065c876a77 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)

drivers/gpu/drm/gud/gud_connector.c static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect · line 407

Quoted 10 lines
drivers/gpu/drm/gud/gud_connector.c +7 -1
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);

[Severity: High]
This is a pre-existing issue, but could a malicious or misconfigured USB device cause a NULL pointer dereference and kernel panic by returning GUD_PROPERTY_TV_MODE after another non-margin TV property?

In gud_connector_add_properties(), properties from the USB device are processed sequentially. If a property like GUD_PROPERTY_TV_BRIGHTNESS is processed first, drm_mode_create_tv_properties_legacy() creates the baseline TV properties but leaves legacy_tv_mode_property as NULL since num_modes is 0.

If GUD_PROPERTY_TV_MODE is processed next, it calls gud_connector_add_tv_mode() which then calls drm_mode_create_tv_properties_legacy() here:

drivers/gpu/drm/drm_connector.c:drm_mode_create_tv_properties_legacy() {
    ...
	if (dev->mode_config.tv_select_subconnector_property)
		return 0;
    ...
}
Quoted 3 lines

This early return prevents dev->mode_config.legacy_tv_mode_property from being created.

Hello

Quoted 11 lines

Then in gud_connector_add_properties(), gud_connector_property_lookup() will return NULL for legacy_tv_mode_property:

drivers/gpu/drm/gud/gud_connector.c:gud_connector_add_properties() {
    ...
		property = gud_connector_property_lookup(connector, prop);
		if (drm_WARN_ON(drm, IS_ERR(property)))
			continue;
    ...
}

It might be an idea to add a null check here, however, I am inclined to accept this patch without it, as it does fix an issue with the current code, and while this issue is related, it is somewhat separate. It would be a good idea to have this as a separate patch instead.

Ruben Wauters

Quoted 15 lines

Since IS_ERR() ignores NULL, the NULL property pointer bypasses this check and is passed to drm_object_attach_property(), which unconditionally dereferences it:

drivers/gpu/drm/drm_mode_object.c:drm_object_attach_property() {
    ...
	struct drm_device *dev = property->dev;
    ...
}

Could this lead to a local denial of service?

Quoted 3 lines
drivers/gpu/drm/gud/gud_connector.c +0 -0
 free:
drivers/gpu/drm/gud/gud_connector.c +0 -0
 	kfree(buf);
 	if (ret < 0)
maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Deepanshu Kartikey
Quoted 7 lines · Deepanshu Kartikey

gud_connector_add_tv_mode() reads a buffer of fixed-size mode names from the USB device and passes pointers into it to drm_mode_create_tv_properties_legacy(), which calls strlen() on each one. Nothing guarantees the device NUL-terminates a name, so strlen() can run past the end of a slot and, for the last mode, past the end of the allocation.

Quoted 7 lines

Terminate each name at the end of its slot before use.

Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]
Quoted 24 lines
---
 drivers/gpu/drm/gud/gud_connector.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/gud/gud_connector.c +7 -2
index ea0cca58b7c8..5c0065c876a7 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);
 free:
maintainer Applied
#4 lore raw
Quoted 8 lines · Ruben Wauters
Quoted 7 lines · Deepanshu Kartikey

gud_connector_add_tv_mode() reads a buffer of fixed-size mode names from the USB device and passes pointers into it to drm_mode_create_tv_properties_legacy(), which calls strlen() on each one. Nothing guarantees the device NUL-terminates a name, so strlen() can run past the end of a slot and, for the last mode, past the end of the allocation.

Quoted 8 lines
Quoted 7 lines

Terminate each name at the end of its slot before use.

Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]

Thank you, applied to drm-misc-fixes, Cc'd stable

Ruben

Quoted 24 lines
Quoted 24 lines
---
 drivers/gpu/drm/gud/gud_connector.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/gud/gud_connector.c +7 -2
index ea0cca58b7c8..5c0065c876a7 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);
 free:
maintainer
#5 lore raw
Quoted 11 lines · Ruben Wauters
Quoted 10 lines · Ruben Wauters
Quoted 9 lines · Deepanshu Kartikey

gud_connector_add_tv_mode() reads a buffer of fixed-size mode names from the USB device and passes pointers into it to drm_mode_create_tv_properties_legacy(), which calls strlen() on each one. Nothing guarantees the device NUL-terminates a name, so strlen() can run past the end of a slot and, for the last mode, past the end of the allocation.

Terminate each name at the end of its slot before use.

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Fixes 40e1a70b4aed ("drm: Add GUD USB Display driver")
Reported-by [email protected]

Thank you, applied to drm-misc-fixes, Cc'd stable

Hello, my apologies, upon checking other patches received, I found a better implementation that returns an error and avoids truncating, as such that one will be applied over this one instead, apologies for any confusion.

Ruben

Quoted 26 lines

Ruben

Quoted 24 lines
Quoted 24 lines
---
 drivers/gpu/drm/gud/gud_connector.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/gud/gud_connector.c +7 -2
index ea0cca58b7c8..5c0065c876a7 100644
@@ -396,8 +396,13 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect
 	}
 
 	num_modes = ret / GUD_CONNECTOR_TV_MODE_NAME_LEN;
-	for (i = 0; i < num_modes; i++)
-		modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+	for (i = 0; i < num_modes; i++) {
+		char *mode = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN];
+
+		/* The device is not trusted to NUL-terminate the name */
+		mode[GUD_CONNECTOR_TV_MODE_NAME_LEN - 1] = '\0';
+		modes[i] = mode;
+	}
 
 	ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes);
 free: