From: Maíra Canal <mcanal@igalia.com>
To: Melissa Wen <mwen@igalia.com>, Iago Toral <itoral@igalia.com>,
Maxime Ripard <mripard@kernel.org>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
Boris Brezillon <bbrezillon@kernel.org>
Cc: kernel-dev@igalia.com, dri-devel@lists.freedesktop.org,
Maíra Canal <mcanal@igalia.com>
Subject: [PATCH 3/6] drm/vc4: Fix a memory leak in hang state error path
Date: Mon, 30 Mar 2026 14:51:45 -0300 [thread overview]
Message-ID: <20260330-vc4-misc-fixes-v1-3-92defc940a29@igalia.com> (raw)
In-Reply-To: <20260330-vc4-misc-fixes-v1-0-92defc940a29@igalia.com>
When vc4_save_hang_state() encounters an early return condition, it
returns without freeing the previously allocated `kernel_state`,
leaking memory.
Add the missing kfree() calls by consolidating the early return paths
into a single place.
Fixes: 214613656b51 ("drm/vc4: Add an interface for capturing the GPU state after a hang.")
Signed-off-by: Maíra Canal <mcanal@igalia.com>
---
drivers/gpu/drm/vc4/vc4_gem.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 248c47665a193fa639a481f97ac2af634f415384..ab3c6d5d4eb446804877d6b8da01c3a9f65800df 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -171,10 +171,8 @@ vc4_save_hang_state(struct drm_device *dev)
spin_lock_irqsave(&vc4->job_lock, irqflags);
exec[0] = vc4_first_bin_job(vc4);
exec[1] = vc4_first_render_job(vc4);
- if (!exec[0] && !exec[1]) {
- spin_unlock_irqrestore(&vc4->job_lock, irqflags);
- return;
- }
+ if (!exec[0] && !exec[1])
+ goto err_free_state;
/* Get the bos from both binner and renderer into hang state. */
state->bo_count = 0;
@@ -191,10 +189,8 @@ vc4_save_hang_state(struct drm_device *dev)
kernel_state->bo = kzalloc_objs(*kernel_state->bo, state->bo_count,
GFP_ATOMIC);
- if (!kernel_state->bo) {
- spin_unlock_irqrestore(&vc4->job_lock, irqflags);
- return;
- }
+ if (!kernel_state->bo)
+ goto err_free_state;
k = 0;
for (i = 0; i < 2; i++) {
@@ -286,6 +282,12 @@ vc4_save_hang_state(struct drm_device *dev)
vc4->hang_state = kernel_state;
spin_unlock_irqrestore(&vc4->job_lock, irqflags);
}
+
+ return;
+
+err_free_state:
+ spin_unlock_irqrestore(&vc4->job_lock, irqflags);
+ kfree(kernel_state);
}
static void
--
2.53.0
next prev parent reply other threads:[~2026-03-30 17:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-30 17:51 [PATCH 0/6] drm/vc4: Miscellaneous fixes and improvements Maíra Canal
2026-03-30 17:51 ` [PATCH 1/6] drm/vc4: Release runtime PM reference after binding V3D Maíra Canal
2026-03-31 7:01 ` Claude review: " Claude Code Review Bot
2026-03-30 17:51 ` [PATCH 2/6] drm/vc4: Fix memory leak of BO array in hang state Maíra Canal
2026-03-31 7:02 ` Claude review: " Claude Code Review Bot
2026-03-30 17:51 ` Maíra Canal [this message]
2026-03-31 7:02 ` Claude review: drm/vc4: Fix a memory leak in hang state error path Claude Code Review Bot
2026-03-30 17:51 ` [PATCH 4/6] drm/vc4: Protect madv read in vc4_gem_object_mmap() with madv_lock Maíra Canal
2026-03-31 7:02 ` Claude review: " Claude Code Review Bot
2026-03-30 17:51 ` [PATCH 5/6] drm/vc4: Use devm_request_irq() for automatic cleanup Maíra Canal
2026-03-31 7:02 ` Claude review: " Claude Code Review Bot
2026-03-30 17:51 ` [PATCH 6/6] drm/vc4: Clean-up UAPI header inclusion Maíra Canal
2026-03-31 7:02 ` Claude review: " Claude Code Review Bot
2026-03-31 7:01 ` Claude review: drm/vc4: Miscellaneous fixes and improvements Claude Code Review Bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260330-vc4-misc-fixes-v1-3-92defc940a29@igalia.com \
--to=mcanal@igalia.com \
--cc=airlied@gmail.com \
--cc=bbrezillon@kernel.org \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=itoral@igalia.com \
--cc=kernel-dev@igalia.com \
--cc=kernel-list@raspberrypi.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=mwen@igalia.com \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox