tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/tests: modes: 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_modes_analog_tv tests never
do 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: 4fcd238560ee ("drm/modes: Add a function to generate analog display modes")
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250408-drm-kunit-drm-display-mode-memleak-v1-5-996305a2e75a@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
+22
+22
drivers/gpu/drm/tests/drm_modes_test.c
+22
drivers/gpu/drm/tests/drm_modes_test.c
···
40
40
{
41
41
struct drm_test_modes_priv *priv = test->priv;
42
42
struct drm_display_mode *mode;
43
+
int ret;
43
44
44
45
mode = drm_analog_tv_mode(priv->drm,
45
46
DRM_MODE_TV_MODE_NTSC,
46
47
13500 * HZ_PER_KHZ, 720, 480,
47
48
true);
48
49
KUNIT_ASSERT_NOT_NULL(test, mode);
50
+
51
+
ret = drm_kunit_add_mode_destroy_action(test, mode);
52
+
KUNIT_ASSERT_EQ(test, ret, 0);
49
53
50
54
KUNIT_EXPECT_EQ(test, drm_mode_vrefresh(mode), 60);
51
55
KUNIT_EXPECT_EQ(test, mode->hdisplay, 720);
···
74
70
{
75
71
struct drm_test_modes_priv *priv = test->priv;
76
72
struct drm_display_mode *expected, *mode;
73
+
int ret;
77
74
78
75
expected = drm_analog_tv_mode(priv->drm,
79
76
DRM_MODE_TV_MODE_NTSC,
···
82
77
true);
83
78
KUNIT_ASSERT_NOT_NULL(test, expected);
84
79
80
+
ret = drm_kunit_add_mode_destroy_action(test, expected);
81
+
KUNIT_ASSERT_EQ(test, ret, 0);
82
+
85
83
mode = drm_mode_analog_ntsc_480i(priv->drm);
86
84
KUNIT_ASSERT_NOT_NULL(test, mode);
85
+
86
+
ret = drm_kunit_add_mode_destroy_action(test, mode);
87
+
KUNIT_ASSERT_EQ(test, ret, 0);
87
88
88
89
KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected, mode));
89
90
}
···
98
87
{
99
88
struct drm_test_modes_priv *priv = test->priv;
100
89
struct drm_display_mode *mode;
90
+
int ret;
101
91
102
92
mode = drm_analog_tv_mode(priv->drm,
103
93
DRM_MODE_TV_MODE_PAL,
104
94
13500 * HZ_PER_KHZ, 720, 576,
105
95
true);
106
96
KUNIT_ASSERT_NOT_NULL(test, mode);
97
+
98
+
ret = drm_kunit_add_mode_destroy_action(test, mode);
99
+
KUNIT_ASSERT_EQ(test, ret, 0);
107
100
108
101
KUNIT_EXPECT_EQ(test, drm_mode_vrefresh(mode), 50);
109
102
KUNIT_EXPECT_EQ(test, mode->hdisplay, 720);
···
132
117
{
133
118
struct drm_test_modes_priv *priv = test->priv;
134
119
struct drm_display_mode *expected, *mode;
120
+
int ret;
135
121
136
122
expected = drm_analog_tv_mode(priv->drm,
137
123
DRM_MODE_TV_MODE_PAL,
···
140
124
true);
141
125
KUNIT_ASSERT_NOT_NULL(test, expected);
142
126
127
+
ret = drm_kunit_add_mode_destroy_action(test, expected);
128
+
KUNIT_ASSERT_EQ(test, ret, 0);
129
+
143
130
mode = drm_mode_analog_pal_576i(priv->drm);
144
131
KUNIT_ASSERT_NOT_NULL(test, mode);
132
+
133
+
ret = drm_kunit_add_mode_destroy_action(test, mode);
134
+
KUNIT_ASSERT_EQ(test, ret, 0);
145
135
146
136
KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected, mode));
147
137
}