From patchwork Wed May 5 04:58:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 12239087 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93243C43461 for ; Wed, 5 May 2021 05:18:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D0C0613C3 for ; Wed, 5 May 2021 05:18:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D0C0613C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1le9vP-0002Fx-93 for qemu-devel@archiver.kernel.org; Wed, 05 May 2021 01:18:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1le9rc-00067t-On for qemu-devel@nongnu.org; Wed, 05 May 2021 01:14:24 -0400 Received: from m12-16.163.com ([220.181.12.16]:58178) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1le9rX-00017O-L7 for qemu-devel@nongnu.org; Wed, 05 May 2021 01:14:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=QTmgs OcfkOmjLcbwZwmklrqfoD9/5A+DbgbSLcgxKAA=; b=jbEwGxjBlg+JeRWbJRAFT /CrhZHyuWNTD8S618/cwFADwy9gaPSsyDdvn10XuIy0d69H9xcdEEYLyO04VkKXC WFoCnhnljsRhwU7VD9UGutG4QNNrw6eYyuL6h0mbU1JuFXQEvgduLwrw6zTtou0h +G6L0Jm45dGYDv7Ce68vlY= Received: from ubuntu.localdomain (unknown [36.22.237.185]) by smtp12 (Coremail) with SMTP id EMCowACXET7zJZJg8VpupQ--.18216S11; Wed, 05 May 2021 12:58:36 +0800 (CST) From: Li Qiang To: marcandre.lureau@redhat.com, kraxel@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 7/7] vhost-user-gpu: fix OOB write in 'virgl_cmd_get_capset' Date: Tue, 4 May 2021 21:58:24 -0700 Message-Id: <20210505045824.33880-8-liq3ea@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505045824.33880-1-liq3ea@163.com> References: <20210505045824.33880-1-liq3ea@163.com> MIME-Version: 1.0 X-CM-TRANSID: EMCowACXET7zJZJg8VpupQ--.18216S11 X-Coremail-Antispam: 1Uf129KBjvdXoWrtw43Ww1fXF1kAF1ktr17trb_yoW3Kwc_XF 4Skrn3Ar4DXryq9Fs8Arn0vrW7ArWUA3Z2vFyfKw1fXFyak3WUXw1fG3s5GrW3Z3ykuF1D A340yw4rWF4q9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUOJ57UUUUU== X-Originating-IP: [36.22.237.185] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiTxyJbVsGYnBXtgAAsZ Received-SPF: pass client-ip=220.181.12.16; envelope-from=liq3ea@163.com; helo=m12-16.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , liq3ea@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If 'virgl_cmd_get_capset' set 'max_size' to 0, the 'virgl_renderer_fill_caps' will write the data after the 'resp'. This patch avoid this by checking the returned 'max_size'. Signed-off-by: Li Qiang Reviewed-by: Prasad J Pandit --- contrib/vhost-user-gpu/virgl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index a16a311d80..7172104b19 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -177,6 +177,10 @@ virgl_cmd_get_capset(VuGpu *g, virgl_renderer_get_cap_set(gc.capset_id, &max_ver, &max_size); + if (!max_size) { + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } resp = g_malloc0(sizeof(*resp) + max_size); resp->hdr.type = VIRTIO_GPU_RESP_OK_CAPSET;