Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 13 Jun 2022 08:33:38 -0100
From:   Melissa Wen <mwen@igalia.com>
To:     Tales Lelo da Aparecida <tales.aparecida@gmail.com>
Cc:     Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>,
        Melissa Wen <melissa.srw@gmail.com>,
        Haneen Mohammed <hamohammed.sa@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        David Airlie <airlied@linux.ie>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        andrealmeid@riseup.net
Subject: Re: [PATCH v2 1/2] drm/vkms: check plane_composer->map[0] before
 using it
Message-ID: <20220613093322.zpikmetwdptzt7iz@mail.igalia.com>
References: <20220415111300.61013-1-tales.aparecida@gmail.com>
 <20220415111300.61013-2-tales.aparecida@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="bkggbyddtyrzuax4"
Content-Disposition: inline
In-Reply-To: <20220415111300.61013-2-tales.aparecida@gmail.com>
Precedence: bulk


--bkggbyddtyrzuax4
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 04/15, Tales Lelo da Aparecida wrote:
> Fix a copypasta error. The caller of compose_plane() already checks
> primary_composer->map. In contrast, plane_composer->map is never
> verified here before handling.
>=20
> Fixes: 7938f4218168 ("dma-buf-map: Rename to iosys-map")
> Reviewed-by: Andr=E9 Almeida <andrealmeid@riseup.net>
> Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
> ---
> v2: detail the commit message with more information
>=20
>  drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/=
vkms_composer.c
> index c6a1036bf2ea..b47ac170108c 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -157,7 +157,7 @@ static void compose_plane(struct vkms_composer *prima=
ry_composer,
>  	void *vaddr;
>  	void (*pixel_blend)(const u8 *p_src, u8 *p_dst);
> =20
> -	if (WARN_ON(iosys_map_is_null(&primary_composer->map[0])))
> +	if (WARN_ON(iosys_map_is_null(&plane_composer->map[0])))
>  		return;

I cherry-picked this one and applied to drm-misc-next.

Thanks,

Melissa

> =20
>  	vaddr =3D plane_composer->map[0].vaddr;
> --=20
> 2.35.1
>=20

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

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

iQIzBAABCgAdFiEEd8WOo/JViG+Tu+XIwqF3j0dLehwFAmKnBHIACgkQwqF3j0dL
ehyPXA//ZOSSI3d6rcOd682oWAZsvh9K8dCpKcS75nKQgBx89u1E3s44VwKZp7uB
+zeIOO07h74t7cKiF33fvCAVyIVSfpV1jMCueclTrxsz1p+DIl2Aq91tnv46WXwa
6URbiuUez8MO7yRZBZAfD5yEp6IOzrI46/QSrLgGKCnCOLgZzO+/stRypjZ9YMfp
RdfUHFUybX8bbHagQc7qXYdReN7PsLz1GjB1vHlbHwar5ScAoNdQ/QBCP0vtNNS3
j0vee4qWmXPvh3gcRbK2YAgeFAzCbORNKQ97WE2sHLuhEP14cFB2ydvb87k7guvd
qmhk49y0ONOAq7LAqqXuR+5rAmw493JbAjcrtOovBKhwsEIRGe+BiRzflbdevtE1
u/WUQd3lERv0JNQiLjO41rzhQTD2SWwxkT/zPeYnn7TitBqAOTFddmszW2kOG8V8
00UN32TOFNEOSqWclGMQzyNdL/dq9egtiH+Mu9KQyVg2EtieRzND22CxaUR6NU9W
nkXbJqwaTUUoMnWyOkCHPu3D4zyc5JXGDS7HhLNI9rmj5LR1rRzRqg3ZSYBLPp22
fYCeuZ3+AY9NMKhoq6ZRh1ayVrfYgxAg5l6sjgYTl8FEaLyAFBtMyzl0jVoNnRzK
cqwXzIYvwGSTHJVaLG2ROLyFJsV5dmSO4e0V9Y8+1hR0gkBRsQc=
=5Ak+
-----END PGP SIGNATURE-----

--bkggbyddtyrzuax4--