drm/amd/display: Add a dc_state NULL check in dc_state_release
PATCH 1/1 drm/amd/display: Add a dc_state NULL check in dc_state_release
From: Allen Pan <[email protected]>
[ Upstream commit 334b56cea5d9df5989be6cf1a5898114fa70ad98 ]
[How]
Check wheather state is NULL before releasing it.
[ Backport to 6.6.y: implemented the same guard in older
dc_release_state() in dc.c rather than dc_state_release() in dc_state.c. ]
---
Hi Greg, Sasha, and drm amd maintainers,
I am working through the small CVE backports still missing from 6.6.y. This one addresses CVE-2024-26948. It adds upstream's NULL guard to the older display-state release helper.
The helper is used by display-state cleanup paths and currently dereferences its argument unconditionally. The patch makes the helper NULL-safe.
The fix is already present in 6.12.y, 6.18.y, and 7.2.y, but not in 6.6.y. This fix also affects 6.1.y, which will need a separate backport; this submission contains only the 6.6.y patch.
The target-specific adjustment is recorded in the bracketed note above.
Could you please queue it for 6.6.y?
CVE: CVE-2024-26948
Upstream: 334b56cea5d9df5989be6cf1a5898114fa70ad98
AI assistance: An LLM helped identify, adapt, and validate this backport; I reviewed the resulting code and validation evidence.
Thanks,
Artem Dinaburg
drivers/gpu/drm/amd/display/dc/core/dc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -1
@@ -2302,7 +2302,8 @@ static void dc_state_free(struct kref *kref)void dc_release_state (struct dc_state *context) { -kref_put (&context->refcount, dc_state_free); +if (context !=NULL ) +kref_put (&context->refcount, dc_state_free); } bool dc_set_generic_gpio_for_stereo(bool enable,
Signature · 1 line
2.39.5
Quoted 2 lines
This one addresses CVE-2024-26948. It adds upstream's NULL guard to the older display-state release helper.
Queued for 6.6, thanks.
Signature · 2 lines
Thanks, Sasha