From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 2DC02C433B4 for ; Tue, 4 May 2021 19:54:37 +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 92D95611AC for ; Tue, 4 May 2021 19:54:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92D95611AC 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]:45722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1le17r-0003y7-NP for qemu-devel@archiver.kernel.org; Tue, 04 May 2021 15:54:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1le16u-0003G9-Mk for qemu-devel@nongnu.org; Tue, 04 May 2021 15:53:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1le16q-0005RC-MY for qemu-devel@nongnu.org; Tue, 04 May 2021 15:53:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620158011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SGYFQaJlW4y3X009ChQ5kV+5vBirU/EC/yfW5L7zZps=; b=bpbPzDifl73p+TQUKWPVLBhfN0eKm+zMklM6QQCdRz2+GmEwxUNZ5UJv8tgRVASpDtP8vK VJj9aGLmmZb7pfQXnHH3krccDTnwj7o1wwDm0MLqur6bWF+1Xz8An0JJrAjGr2Sv3u1yo9 TfEdQ5yZLHx2FwmJ4LyMkS7XvsUzs7s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-Vcylz9JONPKMoOORC6QsYw-1; Tue, 04 May 2021 15:53:27 -0400 X-MC-Unique: Vcylz9JONPKMoOORC6QsYw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E4C5107ACCA; Tue, 4 May 2021 19:53:25 +0000 (UTC) Received: from [10.3.114.144] (ovpn-114-144.phx2.redhat.com [10.3.114.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0A275D9DE; Tue, 4 May 2021 19:53:24 +0000 (UTC) To: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org References: <20210504152023.322862-1-vsementsov@virtuozzo.com> <20210504152023.322862-9-vsementsov@virtuozzo.com> From: Eric Blake Organization: Red Hat, Inc. Subject: Re: [PATCH 08/10] qcow2-refcount: improve style of check_refcounts_l1() Message-ID: Date: Tue, 4 May 2021 14:53:24 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210504152023.322862-9-vsementsov@virtuozzo.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: kwolf@redhat.com, den@openvz.org, ktkhai@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 5/4/21 10:20 AM, Vladimir Sementsov-Ogievskiy wrote: > - use g_autofree for l1_table > - better name for size in bytes variable > - reduce code blocks nesting > - whitespaces, braces, newlines > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > block/qcow2-refcount.c | 97 +++++++++++++++++++++--------------------- > 1 file changed, 49 insertions(+), 48 deletions(-) > > diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c > index 44fc0dd5dc..eb6de3dabd 100644 > --- a/block/qcow2-refcount.c > +++ b/block/qcow2-refcount.c > @@ -1864,71 +1864,72 @@ static int check_refcounts_l1(BlockDriverState *bs, > int flags, BdrvCheckMode fix, bool active) > { > BDRVQcow2State *s = bs->opaque; > - uint64_t *l1_table = NULL, l2_offset, l1_size2; > + size_t l1_size_bytes = l1_size * L1E_SIZE; > + g_autofree uint64_t *l1_table = g_try_malloc(l1_size_bytes); Note that this now happens... > + uint64_t l2_offset; > int i, ret; > > - l1_size2 = l1_size * L1E_SIZE; > + if (!l1_size) { > + return 0; ...before you validate whether l1_size is non-zero, which can result in g_try_malloc(0). Probably harmless, but it might be better if you declare g_autofree uint64_t *l1_table = NULL; and then initialize it via malloc only after the sanity check. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org