From patchwork Sun Jul 4 20:52:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 12357673 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 280DBC07E95 for ; Sun, 4 Jul 2021 20:53:48 +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 91B0B613A9 for ; Sun, 4 Jul 2021 20:53:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91B0B613A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m097a-0006P3-L1 for qemu-devel@archiver.kernel.org; Sun, 04 Jul 2021 16:53:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m096u-00056i-Ai for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:04 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:43739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m096r-0008J4-PC for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:04 -0400 Received: by mail-wm1-x335.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so9955422wmc.2 for ; Sun, 04 Jul 2021 13:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8zuVBKF0lHFrxi85Ur4QwmAtt+OtLI2NAGW+7dDRMEY=; b=Pjn45Vh8oP8s8mCuslaAMbZLNQVeheigAbEEOADX7qX4RC3cbPg/f+0GZL6OrE/pvU TOCfZD/fgd5dNMyGRDk70N9xv33LFAeUn2a0HgI5HWnJknQyI1O+c8EmQyvDsY8Jzj0m AKD9NXI/QDZWnRlO5HnLIvV/K4yGrxqGotVZq+HOZJZr2Wl8ESPlSt182JTz/bxx+ofm FbcJvnk5sTiCRVodQ1vhCYALX4gRjVaADdwEIn0GXe+lSqozj+3gI2Y022kMFCC/I2Q7 K6kOosScnsij6mQqKnpbjG+vb4I0S2msAQeZeIpOAdzMNtfzSJcJszMD/RM4MLUXWu7j 2AFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8zuVBKF0lHFrxi85Ur4QwmAtt+OtLI2NAGW+7dDRMEY=; b=mr6o0Jhc8XGlWcOUAMjtMP4lxuqyunee41+/KLptvSuYcWFahso3yz6xElW8vnoMfI QxLC7A0cy1H+y4pNQFS15Fp7H/kZNXwPBCFOJqsunu6mSU23O32VmxUT5m8+hksbtR3c QzsdI8mkxMBplE9y1Bhc3sJEm4pLl/x9vTCt2O2fxcvz+bodzVCZ5artF4dAzrXywqeC fAUhIZNPoQGT0Q3w9MlhjD4pRz6FyZD8aVKrfHXGx/Rbh5KEIJmlmhjQIb0Nh2B+mqIi lsTQTdwTDGm51SrajrGCqyBcb44jI9nbalXUtySrmTYweV2ubTC6/6JjcxqBe97tCFvx 44IQ== X-Gm-Message-State: AOAM531hTDSOcHlskPtZ2PF3kjI08NA4Rk7yuQJEG+HkjC+DVOT5SEPp SQZ8N1HBhgf8H3w8N62/mQhbOSCGKkg= X-Google-Smtp-Source: ABdhPJxVZVCrNFTwIjw1acBxnXJ5QoFHcx3FhzmYYR3mgyM3DlYYKMjaIwbqB5hv3AgV7NIlFj34iA== X-Received: by 2002:a05:600c:4e88:: with SMTP id f8mr11076430wmq.14.1625431980386; Sun, 04 Jul 2021 13:53:00 -0700 (PDT) Received: from localhost.localdomain ([5.29.30.165]) by smtp.gmail.com with ESMTPSA id y19sm17199997wmj.33.2021.07.04.13.52.58 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Jul 2021 13:52:59 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL V2 1/3] hw/rdma: Fix possible mremap overflow in the pvrdma device (CVE-2021-3582) Date: Sun, 4 Jul 2021 23:52:53 +0300 Message-Id: <20210704205255.27124-2-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> References: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=marcel.apfelbaum@gmail.com; helo=mail-wm1-x335.google.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, 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: mcascell@redhat.com, pjp@fedoraproject.org, yuval.shaia.ml@gmail.com, vv474172261@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marcel Apfelbaum Ensure mremap boundaries not trusting the guest kernel to pass the correct buffer length. Fixes: CVE-2021-3582 Reported-by: VictorV (Kunlun Lab) Tested-by: VictorV (Kunlun Lab) Signed-off-by: Marcel Apfelbaum Message-Id: <20210616110600.20889-1-marcel.apfelbaum@gmail.com> Reviewed-by: Yuval Shaia Tested-by: Yuval Shaia Reviewed-by: Prasad J Pandit Signed-off-by: Marcel Apfelbaum --- v1 -> v2: Fix compilation issue on 32-bit hosts hw/rdma/vmw/pvrdma_cmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index f59879e257..da7ddfa548 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -38,6 +38,13 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, return NULL; } + length = ROUND_UP(length, TARGET_PAGE_SIZE); + if (nchunks * TARGET_PAGE_SIZE != length) { + rdma_error_report("Invalid nchunks/length (%u, %lu)", nchunks, + (unsigned long)length); + return NULL; + } + dir = rdma_pci_dma_map(pdev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) { rdma_error_report("Failed to map to page directory"); From patchwork Sun Jul 4 20:52:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 12357675 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 61048C07E96 for ; Sun, 4 Jul 2021 20:53:50 +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 D3336613A9 for ; Sun, 4 Jul 2021 20:53:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3336613A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m097d-0006Us-3J for qemu-devel@archiver.kernel.org; Sun, 04 Jul 2021 16:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m096v-00057D-LW for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:05 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:52171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m096t-0008Jx-BO for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:05 -0400 Received: by mail-wm1-x32a.google.com with SMTP id n33so2524895wms.1 for ; Sun, 04 Jul 2021 13:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zZbd2/5JTaA7VwZ3/LPsZBUu4gZupP7sm+gNHOgeMf0=; b=i/u1ZwtViYgQqDS/w6QIMS2Soj/fO0uSSBlyZNk5cepYYMA0gIhqiqOO6RraAZP6mm p4c/vJ1Bb4bvuaERM585CadFsxOUboeAbGZCIQ1GFwFnNIGKHGwHuE0wCqPUnxiyXU+f 3ZyGoKdByeEAH7Y+lr4VZe/IawKbI8Vaw+4RNvxqaQuTtJaMu8Xcgd2Z7KJgyrYoQVpd MUjAhEJV1Fgh/TzixBJKQ6BG4l/7ceQLdI1TPbvmn5KbV6Zb2FhHTIKG8byQ9ZjNkJsU jEfj8NW3ruua/gDz2GGgP69gNqK5uufvKCvnLx66ZC9scSUwCFQM2HRTJPtdWvD17wzc zuHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zZbd2/5JTaA7VwZ3/LPsZBUu4gZupP7sm+gNHOgeMf0=; b=ruOQG2wDBDVBsrTtDwDS3fHb6IYBTZSiI3sfv96GHVwFR5uchi1cpk8O27HeJ37tpu KpnIN1hY+J8aAk2iGWDoWd9BDepKLPppWxgB9tCudwq0+AxXUNPGN99X0RgPSgPVDKko iUS61npTpTl2DHDdVWIrCJ+ami8oRVta0aiRXqcQIau0mxANVzb4AzgGdng0BaPt6rxZ Ev3Ak3uilvpeqOC0y9I3RBcb75quB9AQYFHt2qrxvkcPM6ADU0kIg+guKBjTj3tBf8jb Y1k/fQvEBMwcwHfInWiAF9LJPPGTRL1NQk6YkI4QVGL7GNEAtrxXfA2w3MwHmhfRme6S QZqg== X-Gm-Message-State: AOAM532eC/sujUonWXmX2qmXv3ZJJVzanXGwQAYLitQM6PEDmdvtk5No XaInOI4XLPG1pS3d0o1gTS93B+NVkhk= X-Google-Smtp-Source: ABdhPJzaDNptniK4gNUcvGrMfMs2+fspfuED7QIO394gch2Cc2nnfAQ0oSiR2dfVM+ibG+3dGBWpfA== X-Received: by 2002:a1c:770a:: with SMTP id t10mr11140531wmi.29.1625431981959; Sun, 04 Jul 2021 13:53:01 -0700 (PDT) Received: from localhost.localdomain ([5.29.30.165]) by smtp.gmail.com with ESMTPSA id y19sm17199997wmj.33.2021.07.04.13.53.00 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Jul 2021 13:53:01 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL V2 2/3] pvrdma: Ensure correct input on ring init (CVE-2021-3607) Date: Sun, 4 Jul 2021 23:52:54 +0300 Message-Id: <20210704205255.27124-3-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> References: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=marcel.apfelbaum@gmail.com; helo=mail-wm1-x32a.google.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, 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: mcascell@redhat.com, pjp@fedoraproject.org, yuval.shaia.ml@gmail.com, vv474172261@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Check the guest passed a non zero page count for pvrdma device ring buffers. Fixes: CVE-2021-3607 Reported-by: VictorV (Kunlun Lab) Reviewed-by: VictorV (Kunlun Lab) Signed-off-by: Marcel Apfelbaum Message-Id: <20210630114634.2168872-1-marcel@redhat.com> Reviewed-by: Yuval Shaia Tested-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 84ae8024fc..7c0c3551a8 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -92,6 +92,11 @@ static int init_dev_ring(PvrdmaRing *ring, PvrdmaRingState **ring_state, uint64_t *dir, *tbl; int rc = 0; + if (!num_pages) { + rdma_error_report("Ring pages count must be strictly positive"); + return -EINVAL; + } + dir = rdma_pci_dma_map(pci_dev, dir_addr, TARGET_PAGE_SIZE); if (!dir) { rdma_error_report("Failed to map to page directory (ring %s)", name); From patchwork Sun Jul 4 20:52:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 12357679 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 94DCFC07E95 for ; Sun, 4 Jul 2021 20:55:33 +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 53CCA613CB for ; Sun, 4 Jul 2021 20:55:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53CCA613CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m099I-0000wm-Gx for qemu-devel@archiver.kernel.org; Sun, 04 Jul 2021 16:55:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m096x-0005AN-IZ for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:07 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m096v-0008LK-3Y for qemu-devel@nongnu.org; Sun, 04 Jul 2021 16:53:07 -0400 Received: by mail-wm1-x330.google.com with SMTP id o22so10040350wms.0 for ; Sun, 04 Jul 2021 13:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x418SNrj2nMR0PLcR8ORPMYCWf0JT6CneiERD1LoT4s=; b=OUtC+WzVUiH5YooStfNBYiK6gM3uFMVsL3dh4qSJcJx5mHKZe6IKLRFkSg8Vw1IymC NDv5i9Rdx2fkoex68039IPG+cPezXwJk5aJjLie3BBE12TBllZvQElhqFHfU3R7nsNM/ N7mOgoyS50WTqlZ7SDnB9gsJlVSyeIBHZOleYWSA/O0TBj0++UFy+I3TsOvwVADAipcQ OITesLWBvZLvAvqdKQhAUA83zTFfRR+4omorGeJJ122z0M5WQ+9pI/kbUp4tnPDK7drf RKsoyYvO0Ut2WlB2qKBMXhKznb8SauHn+YV6CHfxYDG0+Y7soWIVUfZ5DfCLXPxIZ1q5 lCdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x418SNrj2nMR0PLcR8ORPMYCWf0JT6CneiERD1LoT4s=; b=SjNlQ5OSsNXx+9CFz4WHfRqUfeKRHcJfOuP6U7ps87PnTpdTxTEnwmRmJEJ1+xgHwm +49E5P564z+k7Q1fx5GkTfxGTMHkF5kGMqFyz7oiTEZ3AGnP8dMm3KOHaweOiWYyj7sS VKRwcICIlZUMIjHCsgQOQXSqxbE4ZvkiqG0e4zkbBx/DtKAs47UnxN3Pg5FoISzAPau4 3OCNRppSvkSvACpzHFaWSJeLjTeCwUg7FhPRt0NuNJIs5WlO038CXtPt2ns+kmjUiQ7R li0jdVu/sw4IBICDMNtaVu434yy51pNgzPGt2l1DzUJqKNcyAEz3u64DgDfGPbQNXGm+ ARdg== X-Gm-Message-State: AOAM531GN+lBHQLi/WeZmm/fstM9sUUqRwfKGyBYFbc7y8u3JJIxwwy8 DP50C/YjSya+N4f1DYG9qRLFGlU9MeY= X-Google-Smtp-Source: ABdhPJzBotuqeUlFAPoRy9QyRFU6vl9WXgMlSzy3Du7q9uwGV57jVK6w/WTrmfK5E/HtQSQD0GJoqw== X-Received: by 2002:a1c:4602:: with SMTP id t2mr10882883wma.94.1625431983567; Sun, 04 Jul 2021 13:53:03 -0700 (PDT) Received: from localhost.localdomain ([5.29.30.165]) by smtp.gmail.com with ESMTPSA id y19sm17199997wmj.33.2021.07.04.13.53.02 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Jul 2021 13:53:03 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL V2 3/3] pvrdma: Fix the ring init error flow (CVE-2021-3608) Date: Sun, 4 Jul 2021 23:52:55 +0300 Message-Id: <20210704205255.27124-4-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> References: <20210704205255.27124-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=marcel.apfelbaum@gmail.com; helo=mail-wm1-x330.google.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, 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: mcascell@redhat.com, pjp@fedoraproject.org, yuval.shaia.ml@gmail.com, vv474172261@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Do not unmap uninitialized dma addresses. Fixes: CVE-2021-3608 Reviewed-by: VictorV (Kunlun Lab) Tested-by: VictorV (Kunlun Lab) Signed-off-by: Marcel Apfelbaum Message-Id: <20210630115246.2178219-1-marcel@redhat.com> Tested-by: Yuval Shaia Reviewed-by: Yuval Shaia Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_dev_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c index 074ac59b84..42130667a7 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.c +++ b/hw/rdma/vmw/pvrdma_dev_ring.c @@ -41,7 +41,7 @@ int pvrdma_ring_init(PvrdmaRing *ring, const char *name, PCIDevice *dev, qatomic_set(&ring->ring_state->cons_head, 0); */ ring->npages = npages; - ring->pages = g_malloc(npages * sizeof(void *)); + ring->pages = g_malloc0(npages * sizeof(void *)); for (i = 0; i < npages; i++) { if (!tbl[i]) {