From patchwork Thu Mar 25 11:29:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12163773 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 DC487C433C1 for ; Thu, 25 Mar 2021 11:31:36 +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 23A8D61962 for ; Thu, 25 Mar 2021 11:31:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23A8D61962 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPOD8-00054m-Uk for qemu-devel@archiver.kernel.org; Thu, 25 Mar 2021 07:31:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPOBP-0003VW-E3 for qemu-devel@nongnu.org; Thu, 25 Mar 2021 07:29:47 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:42566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPOBN-0006hI-HQ for qemu-devel@nongnu.org; Thu, 25 Mar 2021 07:29:47 -0400 Received: by mail-wm1-x334.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so974640wmj.1 for ; Thu, 25 Mar 2021 04:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=icH2+ws4BA3MF/VhEqXoYhWBQcPa1zTAGZW92CWb7og=; b=CavDZxvQHAH1WrgLmp5i96hztzD1hLZhh/QzHO6jZG9kZXrRyV0r3WJe9LQ6PWGEyg 3gBBQyTyVkuoGJLuuYPAz9EKjxVepLUJD6whM3Ft7nzONsVQNi1rpwqDy19T3uiCPqOz NN5+8diIRcnaygwAX5K/3dQvc/iTSAGbOjlT/yHFSoSD/Bb2y6pGnZw/k3RlXEMQIfVT /YNBJMsCIvKD7QnDtS01LfUIZ0GTcAricZniU1ui5fyLQUlH6l2g0JjbEpf7Atq1OQtO QYaSnxUKWDDKFl2pmYaLxyVOE1dgTSSJuBAqQBTE+gUsj8fsX2VMS0uwFacSb9Tvy5rp j11Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=icH2+ws4BA3MF/VhEqXoYhWBQcPa1zTAGZW92CWb7og=; b=pJn9dCH33ibA5MrpOcw6DQbcWAgqkljnmn3yuA5eqi7NdTM9ajW9y2zjzkattiDS7/ 9jlFH8ZZZptgGxsu/cvI4Qbn5wizSwhRx4hnLEj2ZajoONw0z5XNkXGAy23neFvI9TKx ydblwByJpYqSZn0iSgx3poYFtUmDqez/8EY+QrFpNw8FT93B3RGrFnSqEHFagfzOCYKl 84Imkii/5a1p5kSspNdbKrgbTsmg1hbXJukEV2XxEFc+9xfRwGOHuFTmsL6dquReWMlX UldgTMjCMx/9sBS7v/fVrFKk6YVtpXGZOXorLy8R+fzOZNNOfyj6EeHCoERF8FC4wxKm QlBg== X-Gm-Message-State: AOAM531BE8okTu8H+Z1b6+I/yRSOotwUvzCPwXtvD0PC/QAmrZLV7LKr 0fT14PTIxbTI4ContiXf60t9gKROvWs= X-Google-Smtp-Source: ABdhPJyGX9Z6x/cvL0dfgZbbT/0yFIg/oYTE3MQL0vwgWyHD6wRxDZs0MAI2GRzJrwGaWWg9qPqpuA== X-Received: by 2002:a1c:4b0a:: with SMTP id y10mr7329840wma.141.1616671784114; Thu, 25 Mar 2021 04:29:44 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id g11sm7220118wrw.89.2021.03.25.04.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 04:29:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v6 1/6] block/vdi: When writing new bmap entry fails, don't leak the buffer Date: Thu, 25 Mar 2021 12:29:36 +0100 Message-Id: <20210325112941.365238-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210325112941.365238-1-pbonzini@redhat.com> References: <20210325112941.365238-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: david.edmondson@oracle.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , stefanha@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: David Edmondson If a new bitmap entry is allocated, requiring the entire block to be written, avoiding leaking the buffer allocated for the block should the write fail. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: David Edmondson Message-Id: <20210309144015.557477-2-david.edmondson@oracle.com> Acked-by: Max Reitz Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- block/vdi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/vdi.c b/block/vdi.c index 5627e7d764..2a6dc26124 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -690,6 +690,7 @@ nonallocating_write: logout("finished data write\n"); if (ret < 0) { + g_free(block); return ret; }