Date:   Fri, 27 Jan 2023 19:05:47 +0000
From:   Mark Brown <broonie@debian.org>
To:     Rob Herring <robh+dt@kernel.org>
Cc:     Frank Rowand <frowand.list@gmail.com>, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Luca Di Stefano <luca.distefano@linaro.org>,
        993612@bugs.debian.org, stable@kernel.org
Subject: Re: [PATCH] of/address: Return an error when no valid dma-ranges are
 found
Message-ID: <Y9Qgi2osVrP/qcAM@sirena.org.uk>
References: <20230126-synquacer-boot-v1-1-94ed0eb1011f@kernel.org>
 <CAL_JsqLPUKS2+8-sShADSYxAgxjP3mh=TcZPszFeYbMTiPvjYQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="UnZ9XPcC2SdAdzt2"
Content-Disposition: inline
In-Reply-To: <CAL_JsqLPUKS2+8-sShADSYxAgxjP3mh=TcZPszFeYbMTiPvjYQ@mail.gmail.com>
Precedence: bulk


--UnZ9XPcC2SdAdzt2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Jan 27, 2023 at 12:37:35PM -0600, Rob Herring wrote:

> Looks to me like we are leaking 'r' with this change.

Oh, probably now that you mention it.  Usually the OF code keeps
track of more things than I expect...

> Wouldn't this change work:

> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index c34ac33b7338..f43311f01c32 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -968,6 +968,11 @@ int of_dma_get_range(struct device_node *np,
> const struct bus_dma_region **map)
>         for_each_of_range(&parser, &range)
>                 num_ranges++;
>=20
> +       if (!num_ranges) {
> +               ret =3D -EINVAL;
> +               goto out;
> +       }
> +

Not as-is, there is a range counted by that first loop but it's
then rejected by the check in the second loop for cpu_addr =3D=3D
OF_BAD_ADDR.  We'd need to add a similar check in the first loop.
It should work otherwise though and avoids doing the allocation
in this case.

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

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmPUIIoACgkQJNaLcl1U
h9BWWgf/fmh+vNOYgJclVva+npcQWUCr724F0B6EUwZhP8m1z7ltvq8qnzdPRo4K
XU+25ixFsMoD0D4hiAQYWweXEzre+sEkpggC7ujSMjMqjYdi2JKuJWVYsQCc4fIt
R67C5beB5xy3jvu5lNujixhC+p4+mvUteOxrbGPjZzKLao/1cX8uI1FuXjGRX6j8
oe7Arw13DwS/0nKjn7CuU1XSLKuYzJ1M6keRj54cDqCvrl87werGGyYGQmr1p1DT
AB71on2CPiWsITqqHi6jbMwcwNOVg9I/024R0GIH1fWqad+1cmnC5yICTlTYwICV
HyehNSl/7fpE3ZRq+EF5HKjUNv7DZA==
=gn0r
-----END PGP SIGNATURE-----

--UnZ9XPcC2SdAdzt2--