Received-SPF: pass (google.com: domain of linux-kernel+bounces-182025-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Content-Type: multipart/signed;
 boundary=2e7c618b67a0e9241d302089bef35dcad20c6b884d610d157a60289baad9;
 micalg=pgp-sha384; protocol="application/pgp-signature"
Date: Fri, 17 May 2024 13:07:06 +0200
Message-Id: <D1BVE3G40OVL.3KX13LU75M122@kernel.org>
Cc: "Jani Nikula" <jani.nikula@intel.com>, "Chen-Yu Tsai"
 <wenst@chromium.org>, <linux-mediatek@lists.infradead.org>,
 <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
From: "Michael Walle" <mwalle@kernel.org>
To: "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>,
 "Chun-Kuang Hu" <chunkuang.hu@kernel.org>, "Philipp Zabel"
 <p.zabel@pengutronix.de>, "David Airlie" <airlied@gmail.com>, "Daniel
 Vetter" <daniel@ffwll.ch>, "Matthias Brugger" <matthias.bgg@gmail.com>
Subject: Re: [PATCH] drm/mediatek/dp: fix spurious kfree()
References: <20240517093024.1702750-1-mwalle@kernel.org>
 <de0191f3-271b-4f0e-aa73-910543587c9d@collabora.com>
In-Reply-To: <de0191f3-271b-4f0e-aa73-910543587c9d@collabora.com>
Precedence: bulk

--2e7c618b67a0e9241d302089bef35dcad20c6b884d610d157a60289baad9
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8

On Fri May 17, 2024 at 12:35 PM CEST, AngeloGioacchino Del Regno wrote:
> Il 17/05/24 11:30, Michael Walle ha scritto:
> > 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.
> >=20
> > Fixes: dab12fa8d2bd ("drm/mediatek/dp: fix memory leak on ->get_edid ca=
llback audio detection")
> > Signed-off-by: Michael Walle <mwalle@kernel.org>
> > ---
> >   drivers/gpu/drm/mediatek/mtk_dp.c | 10 ++++++++--
> >   1 file changed, 8 insertions(+), 2 deletions(-)
> >=20
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediat=
ek/mtk_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(s=
truct 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)
>
> Eh, this will never work, because you're clearing the error before checki=
ng
> if there's any error here?!?! :-P

Don't get what you mean? Yes, I'm ignoring the error. Thus, in case
of an error ret will be zero and there will be no free. If ret was
zero, there won't be a free either. So you're left with the "normal"
case, where you have to free the sads. Just like before.

> Anyway in reality, it returns -ENOMEM if the allocation was not successfu=
l...
> in the event that any future update adds any other error we'd be back wit=
h the same
> issue, but I'm not sure how much should we worry about that.
>
> To be extremely safe, we could do...
>
> if (ret !=3D -ENOMEM)
> 	kfree(sads)
>
> audio_caps->sad_count =3D ret < 0 ? 0 : ret;

Which is the same as above, but you only check for ENOMEM?

-michael

>
> Cheers!
> Angelo
>
> > +			kfree(sads);
> > +		audio_caps->sad_count =3D ret;
> >  =20
> >   		/*
> >   		 * FIXME: This should use connector->display_info.has_audio from


--2e7c618b67a0e9241d302089bef35dcad20c6b884d610d157a60289baad9
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iKgEABMJADAWIQTIVZIcOo5wfU/AngkSJzzuPgIf+AUCZkc6WxIcbXdhbGxlQGtl
cm5lbC5vcmcACgkQEic87j4CH/gAqQF+If8ohfxWzONaLs9k/KTwOxp40wyYspvp
WPYgaY0y+YvqmfPt97bXGMvUrmaKiCVsAYCDq77Zckt0yPwr05dGwlFZov0Ytzw6
mKkHukD+eW43LnjracU3q6+XD7wqRPUSsQQ=
=180b
-----END PGP SIGNATURE-----

--2e7c618b67a0e9241d302089bef35dcad20c6b884d610d157a60289baad9--