From nobody Thu Sep 19 19:24:56 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 790733EA69 for ; Tue, 4 Jun 2024 08:33:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717490024; cv=none; b=ulBgh/Ujo3GW+P4Jc98FlKWPRO9TqvM3bv9R6WfgGA3m/gl8bxPcBNRcInl+4GXuXvTpIEf9oUOraRR+0apK/emz7oISzhCCtHxQGSJU+BBHz2t9xb2hUFj4KVuKymC9pIr+BYaLAha3+/Pc9pUx/JppuZm7rj34NJtCyfbalPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717490024; c=relaxed/simple; bh=WcdjXKp0usjBkPhOi1eWLnKB5YMWTKiIrOQDU48frSc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=G0dTxyRJmxQDkwMt9R8KmZsokT0u8gmHm85ryhyP6i3fMsEuBfDOM0NQIfSl+kwvt6Q6kpkqBdBtP5aJeE4PK/M0T57zGH0KYlKyeqa3jnftau02t19X9OwtYRwmd+RPLmgaJaY1wlCZla+D0OVzj94Dpb/50TG82N8pEuqZ4E0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qZfdi1+5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qZfdi1+5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89DEBC2BBFC; Tue, 4 Jun 2024 08:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717490024; bh=WcdjXKp0usjBkPhOi1eWLnKB5YMWTKiIrOQDU48frSc=; h=From:To:Cc:Subject:Date:From; b=qZfdi1+5gE9tloM9plnd3OEOQJBcvuaiwPhWTsubkB3Hn1yhrHMBn2W32u+eBZSLB j3Px4R8aU+jzL2Q/Gm+E1qYhquQJGBWvOizcZVm5lVCTgwmCmcQK/Y/KK0Ww9amtbW lKZdaM1s5gQTgve53ySXMXBI7m43/erS8Hw7un8inpwt37c4JgVvBlmz9N3EJAuiVI 2wiAymER1ylE2RtZDuWBGJSPo3By47m53Oquc03Vua3beillfXm6uXsEBmSsTcyhyP bxBZbxuxsEC2pnQDkmSK90BXCeNIsoxqqJRuIdAsLSCidQusCgsedOFQ4DFn12ZeYd wbogKIXNYjCJA== From: Michael Walle To: Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno Cc: Jani Nikula , Chen-Yu Tsai , linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michael Walle Subject: [PATCH RESEND] drm/mediatek/dp: fix spurious kfree() Date: Tue, 4 Jun 2024 10:33:37 +0200 Message-Id: <20240604083337.1879188-1-mwalle@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 callba= ck audio detection") Signed-off-by: Michael Walle Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Jani Nikula --- drivers/gpu/drm/mediatek/mtk_dp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/m= tk_dp.c index 536366956447..ada12927bbac 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2073,9 +2073,15 @@ static const struct drm_edid *mtk_dp_edid_read(struc= t drm_bridge *bridge, */ const struct edid *edid =3D drm_edid_raw(drm_edid); struct cea_sad *sads; + int ret; =20 - audio_caps->sad_count =3D drm_edid_to_sad(edid, &sads); - kfree(sads); + ret =3D drm_edid_to_sad(edid, &sads); + /* Ignore any errors */ + if (ret < 0) + ret =3D 0; + if (ret) + kfree(sads); + audio_caps->sad_count =3D ret; =20 /* * FIXME: This should use connector->display_info.has_audio from --=20 2.39.2