Skip to content

Commit 8b6f2e2

Browse files
committed
drm/tests: probe-helper: Fix drm_display_mode memory leak
drm_analog_tv_mode() and its variants return a drm_display_mode that needs to be destroyed later one. The drm_test_connector_helper_tv_get_modes_check() test never does however, which leads to a memory leak. Let's make sure it's freed. Reported-by: Philipp Stanner <phasta@mailbox.org> Closes: https://lore.kernel.org/dri-devel/a7655158a6367ac46194d57f4b7433ef0772a73e.camel@mailbox.org/ Fixes: 1e4a91d ("drm/probe-helper: Provide a TV get_modes helper") Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://lore.kernel.org/r/20250408-drm-kunit-drm-display-mode-memleak-v1-7-996305a2e75a@kernel.org Signed-off-by: Maxime Ripard <mripard@kernel.org>
1 parent f02d3bf commit 8b6f2e2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/gpu/drm/tests/drm_probe_helper_test.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ drm_test_connector_helper_tv_get_modes_check(struct kunit *test)
9898
struct drm_connector *connector = &priv->connector;
9999
struct drm_cmdline_mode *cmdline = &connector->cmdline_mode;
100100
struct drm_display_mode *mode;
101-
const struct drm_display_mode *expected;
101+
struct drm_display_mode *expected;
102102
size_t len;
103103
int ret;
104104

@@ -134,6 +134,9 @@ drm_test_connector_helper_tv_get_modes_check(struct kunit *test)
134134

135135
KUNIT_EXPECT_TRUE(test, drm_mode_equal(mode, expected));
136136
KUNIT_EXPECT_TRUE(test, mode->type & DRM_MODE_TYPE_PREFERRED);
137+
138+
ret = drm_kunit_add_mode_destroy_action(test, expected);
139+
KUNIT_ASSERT_EQ(test, ret, 0);
137140
}
138141

139142
if (params->num_expected_modes >= 2) {
@@ -145,6 +148,9 @@ drm_test_connector_helper_tv_get_modes_check(struct kunit *test)
145148

146149
KUNIT_EXPECT_TRUE(test, drm_mode_equal(mode, expected));
147150
KUNIT_EXPECT_FALSE(test, mode->type & DRM_MODE_TYPE_PREFERRED);
151+
152+
ret = drm_kunit_add_mode_destroy_action(test, expected);
153+
KUNIT_ASSERT_EQ(test, ret, 0);
148154
}
149155

150156
mutex_unlock(&priv->drm->mode_config.mutex);

0 commit comments

Comments
 (0)