]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/tests: modeset: Fix drm_display_mode memory leak
authorMaxime Ripard <mripard@kernel.org>
Tue, 8 Apr 2025 07:34:09 +0000 (09:34 +0200)
committerMaxime Ripard <mripard@kernel.org>
Tue, 8 Apr 2025 15:28:10 +0000 (17:28 +0200)
drm_analog_tv_mode() and its variants return a drm_display_mode that
needs to be destroyed later one. The drm_test_pick_cmdline_named() 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: fedcaf726f54 ("drm/modes: Properly generate a drm_display_mode from a named mode")
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250408-drm-kunit-drm-display-mode-memleak-v1-3-996305a2e75a@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/tests/drm_client_modeset_test.c

index 3e9518d7b8b7eb92f1be3ce376d850cbab638d10..b2fdb1a774fe69c4e14b718324d7380f900bd548 100644 (file)
@@ -132,7 +132,8 @@ static void drm_test_pick_cmdline_named(struct kunit *test)
        struct drm_device *drm = priv->drm;
        struct drm_connector *connector = &priv->connector;
        struct drm_cmdline_mode *cmdline_mode = &connector->cmdline_mode;
-       const struct drm_display_mode *expected_mode, *mode;
+       const struct drm_display_mode *mode;
+       struct drm_display_mode *expected_mode;
        const char *cmdline = params->cmdline;
        int ret;
 
@@ -152,6 +153,9 @@ static void drm_test_pick_cmdline_named(struct kunit *test)
        expected_mode = params->func(drm);
        KUNIT_ASSERT_NOT_NULL(test, expected_mode);
 
+       ret = drm_kunit_add_mode_destroy_action(test, expected_mode);
+       KUNIT_ASSERT_EQ(test, ret, 0);
+
        KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));
 }