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.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 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 563F4C4361B for ; Fri, 18 Dec 2020 13:59:03 +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 CBBFC23A9F for ; Fri, 18 Dec 2020 13:59:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBBFC23A9F 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]:51670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqGHd-0007jm-LX for qemu-devel@archiver.kernel.org; Fri, 18 Dec 2020 08:59:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqGBp-0003Dz-T3 for qemu-devel@nongnu.org; Fri, 18 Dec 2020 08:53:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqGBo-0002aA-0h for qemu-devel@nongnu.org; Fri, 18 Dec 2020 08:53:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608299578; 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=f2khXwyFCEwe1FKGhVgx6ovT0BLzX7RgaRRwKL9p6Sk=; b=dEObe2R9oOweiF2T8gJpl01f6E6j7f2Esx+D3QX8DNl/RY1GFi1mD3ltHE3C4SQbWkqLba GwDXNaQujJJua0MPUoRkcdKAd2eRuUn+NR50SX7tjIDBsFljBBNvoxs0CWsmgzKy7Oosc8 6tHiC3tSROkeC9SUMezznGBZIDDaD0s= 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-404-s-U2lEHYPvGgtKr6XI1yxA-1; Fri, 18 Dec 2020 08:52:57 -0500 X-MC-Unique: s-U2lEHYPvGgtKr6XI1yxA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C549A800D53; Fri, 18 Dec 2020 13:52:55 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96C7760C15; Fri, 18 Dec 2020 13:52:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2B1CC1130358; Fri, 18 Dec 2020 14:52:54 +0100 (CET) From: Markus Armbruster To: Max Reitz Subject: Re: [PATCH 3/9] block/vpc: Don't abuse the footer buffer for dynamic header References: <20201217162003.1102738-1-armbru@redhat.com> <20201217162003.1102738-4-armbru@redhat.com> <7de13ad8-ab0c-3350-7bd0-c8d0fd0c7403@redhat.com> Date: Fri, 18 Dec 2020 14:52:54 +0100 In-Reply-To: <7de13ad8-ab0c-3350-7bd0-c8d0fd0c7403@redhat.com> (Max Reitz's message of "Fri, 18 Dec 2020 11:52:58 +0100") Message-ID: <871rfn9q6h.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: kwolf@redhat.com, mrezanin@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Max Reitz writes: > On 17.12.20 17:19, Markus Armbruster wrote: >> create_dynamic_disk() takes a buffer holding the footer as first >> argument. It writes out the footer (512 bytes), then reuses the >> buffer to initialize and write out the dynamic header (1024 bytes). >> Works, because the caller passes a buffer that is large enough for >> both purposes. I hate that. >> Use a separate buffer for the dynamic header, and adjust the >> caller's >> buffer. >> Signed-off-by: Markus Armbruster >> --- >> block/vpc.c | 22 ++++++++++++---------- >> 1 file changed, 12 insertions(+), 10 deletions(-) >> diff --git a/block/vpc.c b/block/vpc.c >> index d18ecc3da1..34186640ee 100644 >> --- a/block/vpc.c >> +++ b/block/vpc.c >> @@ -822,8 +822,9 @@ static int calculate_geometry(int64_t total_sectors,= uint16_t *cyls, >> static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf, >> int64_t total_sectors) >> { >> + uint8_t dyndisk_header_buf[1024]; >> VHDDynDiskHeader *dyndisk_header =3D >> - (VHDDynDiskHeader *) buf; >> + (VHDDynDiskHeader *)dyndisk_header_buf; >> uint8_t bat_sector[512]; >> size_t block_size, num_bat_entries; >> int i; >> @@ -858,7 +859,7 @@ static int create_dynamic_disk(BlockBackend *blk, ui= nt8_t *buf, >> } >> /* Prepare the Dynamic Disk Header */ >> - memset(buf, 0, 1024); >> + memset(dyndisk_header_buf, 0, 1024); >> memcpy(dyndisk_header->magic, "cxsparse", 8); > > I=E2=80=99d prefer something like > > *dyndisk_header =3D (VHDDynDiskHeader){ > ... > }; > > but that isn=E2=80=99t possible before patch 5. Yes. And afterwards, using an initializer would be even simpler, I guess. > (And can be done on top now > anyway, especially given that Kevin probably wants to send a pull=20 > request today.) Yes, would be good to get this wrapped before the break. > [...] > >> @@ -972,8 +974,8 @@ static int coroutine_fn vpc_co_create(BlockdevCreate= Options *opts, >> BlockBackend *blk =3D NULL; >> BlockDriverState *bs =3D NULL; >> - uint8_t buf[1024]; >> - VHDFooter *footer =3D (VHDFooter *) buf; >> + uint8_t footer_buf[HEADER_SIZE]; >> + VHDFooter *footer =3D (VHDFooter *)footer_buf; >> uint16_t cyls =3D 0; >> uint8_t heads =3D 0; >> uint8_t secs_per_cyl =3D 0; >> @@ -1036,7 +1038,7 @@ static int coroutine_fn vpc_co_create(BlockdevCrea= teOptions *opts, >> } >> /* Prepare the Hard Disk Footer */ >> - memset(buf, 0, 1024); >> + memset(footer_buf, 0, HEADER_SIZE); >> memcpy(footer->creator, "conectix", 8); > > Same here, except here it=E2=80=99s patch 7. > > Reviewed-by: Max Reitz Thanks!