]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/tests: cmdline: Fix drm_display_mode memory leak
authorMaxime Ripard <mripard@kernel.org>
Tue, 8 Apr 2025 07:34:10 +0000 (09:34 +0200)
committerMaxime Ripard <mripard@kernel.org>
Tue, 8 Apr 2025 15:28:14 +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_cmdline_tv_options() 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: e691c9992ae1 ("drm/modes: Introduce the tv_mode property as a command-line option")
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250408-drm-kunit-drm-display-mode-memleak-v1-4-996305a2e75a@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/tests/drm_cmdline_parser_test.c

index 59c8408c453c2ef8f18c7c887b0405418e9e1f99..1cfcb597b088b4d159a5fb10a309338cb73abbe9 100644 (file)
@@ -7,6 +7,7 @@
 #include <kunit/test.h>
 
 #include <drm/drm_connector.h>
+#include <drm/drm_kunit_helpers.h>
 #include <drm/drm_modes.h>
 
 static const struct drm_connector no_connector = {};
@@ -955,8 +956,15 @@ struct drm_cmdline_tv_option_test {
 static void drm_test_cmdline_tv_options(struct kunit *test)
 {
        const struct drm_cmdline_tv_option_test *params = test->param_value;
-       const struct drm_display_mode *expected_mode = params->mode_fn(NULL);
+       struct drm_display_mode *expected_mode;
        struct drm_cmdline_mode mode = { };
+       int ret;
+
+       expected_mode = params->mode_fn(NULL);
+       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_parse_command_line_for_connector(params->cmdline,
                                                                          &no_connector, &mode));