From nobody Sun Feb 8 22:35:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608248054; cv=none; d=zohomail.com; s=zohoarc; b=oCR64FeLZhPZWcvtPfRg7F/dmi521PqvEJu0WF9fBAU3IonyMzWdA6bQnFHRtEjDQHdcGqEdcaaU8E2KNga1uFAwr75tnCRRc26w3pri7adOK6k5Ghf3PvyrIszGXtUoCqIMKTVQejDH1dXe9EERRAXCNAIFXqLp0+V+ya4sNb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608248054; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pACxAMuSVyL0Q9r6OciqTPkBBSnoS2TTQgXRl+aqB8w=; b=G+tubQs347QPdrLWHzPiPwARrMjuBjt6/sZpNZxTYCb1K7DnAeojHB5IuPhLjnVrURigcuu0A1qSOS+O1AyhobcvSTP4ueYNd36SIrLa3pHtp8HPVR7cVb3HUQl5u7yGUpqfaOQXrEMlkIVZdqBqR0kQSB8zum4TJTJTmLd9dz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608248054625578.9641137362456; Thu, 17 Dec 2020 15:34:14 -0800 (PST) Received: from localhost ([::1]:39528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpw78-00039u-CL for importer@patchew.org; Thu, 17 Dec 2020 11:26:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpw0m-0002Ei-5k for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:20:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpw0f-0005Oh-VI for qemu-devel@nongnu.org; Thu, 17 Dec 2020 11:20:14 -0500 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-544-dHAFWnG3O6WhtZFu9fy_ZA-1; Thu, 17 Dec 2020 11:20:07 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96DCE1842140; Thu, 17 Dec 2020 16:20:06 +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 626D810013C0; Thu, 17 Dec 2020 16:20:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 79F4D11275DA; Thu, 17 Dec 2020 17:20:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608222009; 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=pACxAMuSVyL0Q9r6OciqTPkBBSnoS2TTQgXRl+aqB8w=; b=WoYHKyCF020jGumrRzKviaKLUQ/60JlDAR46A2dL5+/yyN5g02QC3+ROShH71Yy985eOCW q5z3OdzKrwzfsMcg+8zqNYb7X2/PQlBn8+BuyJAzg0AojeKLqg7/6dLbyLAmfkW3SN9AU3 exY4zCZpJ5T45S+ozr4VAzXheQJsnac= X-MC-Unique: dHAFWnG3O6WhtZFu9fy_ZA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 6/9] block/vpc: Use sizeof() instead of 1024 for dynamic header size Date: Thu, 17 Dec 2020 17:20:00 +0100 Message-Id: <20201217162003.1102738-7-armbru@redhat.com> In-Reply-To: <20201217162003.1102738-1-armbru@redhat.com> References: <20201217162003.1102738-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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, mrezanin@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz --- block/vpc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 08a0f710ad..6cb656ac82 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -344,7 +344,7 @@ static int vpc_open(BlockDriverState *bs, QDict *option= s, int flags, =20 if (disk_type =3D=3D VHD_DYNAMIC) { ret =3D bdrv_pread(bs->file, be64_to_cpu(footer->data_offset), - &dyndisk_header, 1024); + &dyndisk_header, sizeof(dyndisk_header)); if (ret < 0) { error_setg(errp, "Error reading dynamic VHD header"); goto fail; @@ -858,7 +858,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8= _t *buf, } =20 /* Prepare the Dynamic Disk Header */ - memset(&dyndisk_header, 0, 1024); + memset(&dyndisk_header, 0, sizeof(dyndisk_header)); =20 memcpy(dyndisk_header.magic, "cxsparse", 8); =20 @@ -872,12 +872,13 @@ static int create_dynamic_disk(BlockBackend *blk, uin= t8_t *buf, dyndisk_header.block_size =3D cpu_to_be32(block_size); dyndisk_header.max_table_entries =3D cpu_to_be32(num_bat_entries); =20 - dyndisk_header.checksum =3D cpu_to_be32(vpc_checksum(&dyndisk_header, = 1024)); + dyndisk_header.checksum =3D cpu_to_be32( + vpc_checksum(&dyndisk_header, sizeof(dyndisk_header))); =20 /* Write the header */ offset =3D 512; =20 - ret =3D blk_pwrite(blk, offset, &dyndisk_header, 1024, 0); + ret =3D blk_pwrite(blk, offset, &dyndisk_header, sizeof(dyndisk_header= ), 0); if (ret < 0) { goto fail; } --=20 2.26.2