smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: Avoid uclass allocation in video_idle() cyclic

Browse Source 
When the test framework reinitialises driver model, it orphans existing
uclasses without calling their destroy callbacks. The video_idle cyclic
callback remains registered and when it runs, it calls uclass_get()
which creates new uclasses if they don't exist.

Use uclass_find() instead which returns NULL if the uclass doesn't
exist, allowing video_idle to gracefully exit without allocating memory.
This avoids memory-leak detection failures in tests like dm_test_host.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2026-01-01 14:16:15 -07:00
parent 84a64607a3
commit 5e1b381dd4
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/video-uclass.c
View File

@@ -669,10 +669,14 @@ static void video_idle(struct cyclic_info *cyc)
{
struct video_uc_priv *uc_priv;
struct uclass *uc;
int ret;
ret = uclass_get(UCLASS_VIDEO, &uc);
if (ret)
/*
* Use uclass_find() rather than uclass_get() since the latter may
* create a new uclass if the test framework has reinitialised driver
* model while this cyclic function is still registered.
*/
uc = uclass_find(UCLASS_VIDEO);
if (!uc)
return;
uc_priv = uclass_get_priv(uc);
@@ -683,13 +687,15 @@ static void video_idle(struct cyclic_info *cyc)
if (CONFIG_IS_ENABLED(CURSOR)) {
struct udevice *cons;
struct uclass *uc;
/* Handle cursor display for each video console */
uclass_id_foreach_dev(UCLASS_VIDEO_CONSOLE, cons, uc) {
if (device_active(cons)) {
vidconsole_idle(cons);
video_sync(cons->parent, true);
uc = uclass_find(UCLASS_VIDEO_CONSOLE);
if (uc) {
list_for_each_entry(cons, &uc->dev_head, uclass_node) {
if (device_active(cons)) {
vidconsole_idle(cons);
video_sync(cons->parent, true);
}
}
}
} else {