From nobody Fri Dec 19 16:02:06 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 C52D8C04A95 for ; Sat, 22 Oct 2022 08:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231532AbiJVIhl (ORCPT ); Sat, 22 Oct 2022 04:37:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233906AbiJVIbk (ORCPT ); Sat, 22 Oct 2022 04:31:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE0D02E532D; Sat, 22 Oct 2022 01:03:28 -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 AE9D860AE8; Sat, 22 Oct 2022 07:38:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6EBAC433D7; Sat, 22 Oct 2022 07:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424308; bh=YbETp0ie27chZJgqXsmyTni1sjbuOpVN+srHS8SvM1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtwyQed/zH/44PY3WYIS48QgDE1aaNgfcpGvAa1eYtdDOYZ+9Da2+WFkjYrIRpDTy FaKFtGQ2Dm6lfOw84i2FqK2k2gYBTIInkq2PpABOoK4Dq3UuvxBrzqh2kyzRETqUrK Zu9zIKp8sCfTJ+WP9WWBuOUrqActiTge3iW3LqfQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emil Velikov , Dmitry Osipenko , Gerd Hoffmann Subject: [PATCH 5.19 067/717] drm/virtio: Check whether transferred 2D BO is shmem Date: Sat, 22 Oct 2022 09:19:06 +0200 Message-Id: <20221022072426.988879285@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dmitry Osipenko commit e473216b42aa1fd9fc6b94b608b42c210c655908 upstream. Transferred 2D BO always must be a shmem BO. Add check for that to prevent NULL dereference if userspace passes a VRAM BO. Cc: stable@vger.kernel.org Reviewed-by: Emil Velikov Signed-off-by: Dmitry Osipenko Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-3= -dmitry.osipenko@collabora.com Signed-off-by: Gerd Hoffmann Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -595,7 +595,7 @@ void virtio_gpu_cmd_transfer_to_host_2d( bool use_dma_api =3D !virtio_has_dma_quirk(vgdev->vdev); struct virtio_gpu_object_shmem *shmem =3D to_virtio_gpu_shmem(bo); =20 - if (use_dma_api) + if (virtio_gpu_is_shmem(bo) && use_dma_api) dma_sync_sgtable_for_device(vgdev->vdev->dev.parent, shmem->pages, DMA_TO_DEVICE);