drm/mediatek/dp: fix spurious kfree()
Subsystems (3)
PATCH RESEND 1/1 drm/mediatek/dp: fix spurious kfree()
drm_edid_to_sad() might return an error or just zero. If that is the case, we must not free the SADs because there was no allocation in the first place.
Fixes dab12fa8d2bd ("drm/mediatek/dp: fix memory leak on ->get_edid callback audio detection")
Signed-off-by Michael Walle <[email protected]>
Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Reviewed-by Jani Nikula <[email protected]>
--- drivers/gpu/drm/mediatek/mtk_dp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_dp.c +8 -2
@@ -2073,9 +2073,15 @@ static const struct drm_edid *mtk_dp_edid_read(struct drm_bridge *bridge,*/ const struct edid *edid =drm_edid_raw (drm_edid);struct cea_sad *sads; +int ret; - audio_caps->sad_count =drm_edid_to_sad (edid, &sads); -kfree (sads); + ret =drm_edid_to_sad (edid, &sads); +/* Ignore any errors */ +if (ret <0 ) + ret =0 ; +if (ret) +kfree (sads); + audio_caps->sad_count = ret;/* * FIXME: This should use connector->display_info.has_audio from
Signature · 1 line
2.39.2
Hi, Michael:
Michael Walle <[email protected]> 於 2024年6月4日 週二 下午4:33寫道:
Quoted 4 lines
drm_edid_to_sad()might return an error or just zero. If that is the case, we must not free the SADs because there was no allocation in the first place.
Applied to mediatek-drm-next [1], thanks.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next
Quoted 34 lines
Fixes dab12fa8d2bd ("drm/mediatek/dp: fix memory leak on ->get_edid callback audio detection")Signed-off-by Michael Walle <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Jani Nikula <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/mediatek/mtk_dp.c +8
-3@@ -2073,9 +2073,15 @@ static const struct drm_edid *mtk_dp_edid_read(struct drm_bridge *bridge,*/ const struct edid *edid =drm_edid_raw (drm_edid);struct cea_sad *sads; +int ret; - audio_caps->sad_count =drm_edid_to_sad (edid, &sads); -kfree (sads); + ret =drm_edid_to_sad (edid, &sads); +/* Ignore any errors */ +if (ret <0 ) + ret =0 ; +if (ret) +kfree (sads); + audio_caps->sad_count = ret;/* * FIXME: This should use connector->display_info.has_audio from -- 2.39.2