From nobody Wed Dec 17 17:25:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC19DC636BD for ; Fri, 24 Nov 2023 18:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345549AbjKXSnD (ORCPT ); Fri, 24 Nov 2023 13:43:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjKXSnA (ORCPT ); Fri, 24 Nov 2023 13:43:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 024391B6 for ; Fri, 24 Nov 2023 10:43:07 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12139C433C7; Fri, 24 Nov 2023 18:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700851386; bh=XfGLfOIgKNcjrNSjNEBK5FWdw0y2NMMK6HCt/LP+kug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z7Gj9TEwZ+cnKCu2EW8FlsAo4J7eQZFc9y8RkjrRzajVFHTXXqtn/PPgSX7AR66hm pW7Pu/Qda5ONmcBBG37qZm4xVYD3gNZsR87fp9ZwN90Ka9E5cYTBQ7x6Q7zKlnXAzM +WVVPem9Pn+1dHhcPOkp6Un3f71/5k0XcesPJx8k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guillaume Ranquet , Bo-Chen Chen , AngeloGioacchino Del Regno , Dmitry Osipenko , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jani Nikula , Chen-Yu Tsai Subject: [PATCH 6.5 427/491] drm/mediatek/dp: fix memory leak on ->get_edid callback audio detection Date: Fri, 24 Nov 2023 17:51:03 +0000 Message-ID: <20231124172037.441688419@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124172024.664207345@linuxfoundation.org> References: <20231124172024.664207345@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 6.5-stable review patch. If anyone has any objections, please let me know. Reviewed-by: Chen-Yu Tsai ------------------ From: Jani Nikula commit dab12fa8d2bd3868cf2de485ed15a3feef28a13d upstream. The sads returned by drm_edid_to_sad() needs to be freed. Fixes: e71a8ebbe086 ("drm/mediatek: dp: Audio support for MT8195") Cc: Guillaume Ranquet Cc: Bo-Chen Chen Cc: AngeloGioacchino Del Regno Cc: Dmitry Osipenko Cc: Chun-Kuang Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: dri-devel@lists.freedesktop.org Cc: linux-mediatek@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: # v6.1+ Signed-off-by: Jani Nikula Reviewed-by: Chen-Yu Tsai Link: https://patchwork.kernel.org/project/dri-devel/patch/20230914155317.2= 511876-1-jani.nikula@intel.com/ Signed-off-by: Chun-Kuang Hu Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/mediatek/mtk_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -1983,7 +1983,6 @@ static struct edid *mtk_dp_get_edid(stru bool enabled =3D mtk_dp->enabled; struct edid *new_edid =3D NULL; struct mtk_dp_audio_cfg *audio_caps =3D &mtk_dp->info.audio_cur_cfg; - struct cea_sad *sads; =20 if (!enabled) { drm_atomic_bridge_chain_pre_enable(bridge, connector->state->state); @@ -2010,7 +2009,11 @@ static struct edid *mtk_dp_get_edid(stru } =20 if (new_edid) { + struct cea_sad *sads; + audio_caps->sad_count =3D drm_edid_to_sad(new_edid, &sads); + kfree(sads); + audio_caps->detect_monitor =3D drm_detect_monitor_audio(new_edid); }