Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7293404rwi; Mon, 24 Oct 2022 12:29:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM60oO0c9AnNORtWUyDEiPqg69PmwYRwwMO8IEvoCZby4cOqbrzKpd12g4eXpv7kDt78XcLk X-Received: by 2002:a05:6402:249f:b0:453:eb1b:1f8b with SMTP id q31-20020a056402249f00b00453eb1b1f8bmr31462787eda.235.1666639759935; Mon, 24 Oct 2022 12:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639759; cv=none; d=google.com; s=arc-20160816; b=cXoyl0Efv1m+Vu4eeGRP0aEfUoHMeirDIYvrAVFx4BjpmyjNRdKfliXysCkfECggbf ObzRHBgYrl4XBmmiwzIhGMNikz2Oxq7CejusvCkk2phWc480N+LMvSOPlwWjn9oz8ZkO iQheqdC3+EpPEhYK//gViukVfcgfs6vH/ttMNaEEi93iy+eBbouQi4XE54Gd7p/WNNax E3Eb4Yfo9rqCReZwNkxZr/TPTYPTCdNsnE1sGsk0ycBJLYa3rIjj+30Xt+S4o5dT7yIA VaGEK0LOYgwNWwrVFAUzBm8RnNofBBfuKX3pwiQT/uOYfvgm0Y/gZg0XlA7Cm4+i/UeC Jq9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=e2YeY/kcrqb3AKKVUVVwsSyQM5REew7QXivqpTnFpqE=; b=zBqGaC4Myyo84D5HzkTiJ/DwZEfPStIGqowHZ2hMbznbC7vzjqsAPVTD6pAICp4prz gAo3lZOAeI9P084vm8PUgbPmydP8zBKjG0jpEAvIUkQtmt3Qx4GnSrGnS43CB7wZhN1s YVBUfYsZmez0wd5lGsjoYlX8BVSGw16SE67wsQ8M7mOoMa788iDLf6ZihehlD9DJyboX wNb6asbT/8EZhgJmW4mHZCLHBg/hggur2cfmInSYnH57LCM6zM9kxKMSMo8iFAgq+P2r vpt/yoLUE/nufJ1IGuc4ngSN3MTn4JZluFRddBKIC3ZciXoR7cndlz6Ri6G/IZdKOZ4x 39iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GEQCWIc8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc5-20020a1709071c0500b0078b6559a610si755184ejc.12.2022.10.24.12.28.53; Mon, 24 Oct 2022 12:29:19 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GEQCWIc8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbiJXT0J (ORCPT + 99 others); Mon, 24 Oct 2022 15:26:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233413AbiJXTYT (ORCPT ); Mon, 24 Oct 2022 15:24:19 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DCD35F97; Mon, 24 Oct 2022 10:58:29 -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 sin.source.kernel.org (Postfix) with ESMTPS id 6CFBBCE14A1; Mon, 24 Oct 2022 12:35:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CF6BC433B5; Mon, 24 Oct 2022 12:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614917; bh=Jgi4mrBR328S0MNpG/WIGo/8HcNd3ZWEGnBsN0aaC7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GEQCWIc8qgID73AIwnlQQOE9UxxdUzqD2k0wElOtBHEzk9pbhgRQfdJPWJYHI86/j n4t+E3aCJ8rOQXaU3tfRDeRyWGqLVc87ivhOiyrbU5Qrb+w3hZcFVizQQF7YE+AHf3 2crGTjdAITokYWjFtI4RbIyECfyrkyoDQvWqtxyg= 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.15 052/530] drm/virtio: Check whether transferred 2D BO is shmem Date: Mon, 24 Oct 2022 13:26:36 +0200 Message-Id: <20221024113047.383353870@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 @@ -604,7 +604,7 @@ void virtio_gpu_cmd_transfer_to_host_2d( bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev); struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo); - 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);