Skip to contentSkip to conversation

drm/tests: shmem: Fix memleak

PATCH Applied Maxime Ripard 2 participants 3 messages Apr 8, 2025 – Apr 29, 2025

Subsystems (2)
lore
Share & tools
lore

Maxime Ripard

author maintainer
#0 lore raw

PATCH 1/1 drm/tests: shmem: Fix memleak

The drm_gem_shmem_test_get_pages_sgt() gets a scatter-gather table using the drm_gem_shmem_get_sg_table() function and rightfully calls sg_free_table() on it. However, it's also supposed to kfree() the returned sg_table, but doesn't.

This leads to a memory leak, reported by kmemleak. Fix it by adding a kunit action to kfree the sgt when the test ends.

Fixes 93032ae634d4 ("drm/test: add a test suite for GEM objects backed by shmem")
---
 drivers/gpu/drm/tests/drm_gem_shmem_test.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/tests/drm_gem_shmem_test.c +3 -0
index fd4215e2f982..925fbc2cda70 100644
@@ -214,10 +214,13 @@ static void drm_gem_shmem_test_get_pages_sgt(struct kunit *test)
 
 	sgt = drm_gem_shmem_get_sg_table(shmem);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, sgt);
 	KUNIT_EXPECT_NULL(test, shmem->sgt);
 
+	ret = kunit_add_action_or_reset(test, kfree_wrapper, sgt);
+	KUNIT_ASSERT_EQ(test, ret, 0);
+
 	ret = kunit_add_action_or_reset(test, sg_free_table_wrapper, sgt);
 	KUNIT_ASSERT_EQ(test, ret, 0);
 
 	for_each_sgtable_sg(sgt, sg, si) {
 		KUNIT_EXPECT_NOT_NULL(test, sg);
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw

Maxime Ripard <[email protected]> writes:

Hello Maxime,

Quoted 5 lines

The drm_gem_shmem_test_get_pages_sgt() gets a scatter-gather table using the drm_gem_shmem_get_sg_table() function and rightfully calls sg_free_table() on it. However, it's also supposed to kfree() the returned sg_table, but doesn't.

Quoted 8 lines

This leads to a memory leak, reported by kmemleak. Fix it by adding a kunit action to kfree the sgt when the test ends.

Fixes 93032ae634d4 ("drm/test: add a test suite for GEM objects backed by shmem")

---

Signature · 5 lines
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat
author maintainer Applied
#2 lore raw
In reply to Maxime Ripard
Quoted 9 lines · Maxime Ripard

The drm_gem_shmem_test_get_pages_sgt() gets a scatter-gather table using the drm_gem_shmem_get_sg_table() function and rightfully calls sg_free_table() on it. However, it's also supposed to kfree() the returned sg_table, but doesn't.

This leads to a memory leak, reported by kmemleak. Fix it by adding a kunit action to kfree the sgt when the test ends.

[...]

Applied to misc/kernel.git (drm-misc-fixes).

Thanks!
Maxime