From nobody Mon Sep 29 22:44:54 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 B28F8C25B0E for ; Mon, 15 Aug 2022 23:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353588AbiHOXcE (ORCPT ); Mon, 15 Aug 2022 19:32:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343925AbiHOX0K (ORCPT ); Mon, 15 Aug 2022 19:26:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91561474D4; Mon, 15 Aug 2022 13:06:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2D2D760025; Mon, 15 Aug 2022 20:06:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2041CC433C1; Mon, 15 Aug 2022 20:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593980; bh=FU27mNks8W5srJ5JvNYi5+dQrXnSsKiy73X4z1VGlp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYf26RQI3lCEMsbeutyGd8QSEn9KF8SaTnQ+wlmNa6fFoEHe7bx18881GYO9rdRve smY6iR2jS0GGYIETkz6wN2Tc4VKmj/qgx68K/fr3JcAE0q9GlnB8niOJVKo73QKnUo sxD5A1jCTGHiinEiIQcQ8Hc9YEZXcjAQ3cjFyRqI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Andr=C3=A9=20Almeida?= , Tales Lelo da Aparecida , Melissa Wen , Sasha Levin Subject: [PATCH 5.19 0357/1157] drm/vkms: check plane_composer->map[0] before using it Date: Mon, 15 Aug 2022 19:55:13 +0200 Message-Id: <20220815180453.997054498@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tales Lelo da Aparecida [ Upstream commit 24f6fe3226c6f9f1b8406311a96b59c6e650b707 ] 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. Fixes: 7938f4218168 ("dma-buf-map: Rename to iosys-map") Reviewed-by: Andr=C3=A9 Almeida Signed-off-by: Tales Lelo da Aparecida Signed-off-by: Melissa Wen Link: https://patchwork.freedesktop.org/patch/msgid/20220415111300.61013-2-= tales.aparecida@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_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 *primary= _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; =20 vaddr =3D plane_composer->map[0].vaddr; --=20 2.35.1