From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by mx.groups.io with SMTP id smtpd.web12.40778.1658238276903541328 for ; Tue, 19 Jul 2022 06:44:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GoSddntU; spf=pass (domain: gmail.com, ip: 209.85.208.182, mailfrom: aladyshev22@gmail.com) Received: by mail-lj1-f182.google.com with SMTP id o12so17430234ljc.3 for ; Tue, 19 Jul 2022 06:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rx2Z9FT+SM0nKgTC6b/uDMrsYAy5CwsAwCG2lgF+Dl0=; b=GoSddntUCjOpeAa4ChPxRcBn1wfOpY1o1IJ86oCoTNR42Iq5ofYx8DH2rLwIx2pdrn 34cViPss3C6x4IYUgcPV6kiOBTgFPKjJe4CihYm7EuNP6Vj8O1+UlYCZszmQ8Z8M4EMj CeNhq098KqgSAq6oarBDNuJx64TOdT++rwS9tSC2lgSPLtAhP/4OOQfMrkhyK3BcOrWi queTTeHFKLxJstHq87ZoZsRMpjsTCpfsId4LkSe70aY2PYm54rdmMWd2bK2znHsPwIrY oN/B3RvOESd9eN/p7JbtT96wM+ojikd/Oe9UTus4v67opUKIaVMXXYBF6cBmKEMRoH4N DDWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rx2Z9FT+SM0nKgTC6b/uDMrsYAy5CwsAwCG2lgF+Dl0=; b=a8preh7nw8sm2nvJrhYLHCn12r2kJQ/iPm2BwRNQA76DGhFMpkH9KQUsmcbCrkjM5P 8i7e1f6g+d/nEEvyNzWjTDkfFv6+eLvIrUVTksM0WCQZSXfqNYW1iHKAuyUL6qoLvxSr wr+tN8NsxGPJvPmxhZ4lw8rIQwxqHZivVWXBu8YNDxSPkp8mllYuu6ih7ktLjXwUAOg9 oJ9sFmCxiTCAxYOh1Ou6vFszcKVPzIzGP8qEvPW7H4bGfcz0EojkSwb3X7O0cmFJJ1zZ 71vgeKVXLe4Z8kqoUI162qJrw3nbQuJ3cc4MhCL/ldradt480kw71rRhgxtlcQNQUJ/+ AUjA== X-Gm-Message-State: AJIora/j974Sugh681ECyCDzI0ti+MKCMbuA9CEPtBU7fvapK1vrr07i Ss6f6NGr1dLD/CHXx4KEX3UXThrgorT+Gy56 X-Google-Smtp-Source: AGRyM1usc/RhUMZ/963+xV3hMqu6dE+kxti5LO9j/ScT+41S5syV3sRQUkomk5uILtv2aS9tUwf0jw== X-Received: by 2002:a2e:87ca:0:b0:25d:795c:6db7 with SMTP id v10-20020a2e87ca000000b0025d795c6db7mr15443001ljj.241.1658238274767; Tue, 19 Jul 2022 06:44:34 -0700 (PDT) Return-Path: Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id e9-20020a2eb1c9000000b0025d762cee0esm2677804lja.10.2022.07.19.06.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 06:44:34 -0700 (PDT) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, Konstantin Aladyshev Subject: [PATCH] BaseTools/VolInfo: Correct buffer for GenCrc32 tool Date: Tue, 19 Jul 2022 16:44:35 +0300 Message-Id: <20220719134435.8054-1-aladyshev22@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If the guided section was encoded with GenCrc32 tool the resulting 'EFI_GUID_DEFINED_SECTION.DataOffset' field points to the start of the meaningfull data that follows the CRC32 value. But if we want to decode the section with GenCrc32 tool we need to provide a buffer that includes the CRC32 value itself. Signed-off-by: Konstantin Aladyshev --- BaseTools/Source/C/VolInfo/VolInfo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolI= nfo/VolInfo.c index f450796f9c..47a8f80f46 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -1999,6 +1999,13 @@ Returns: );=0D free (ExtractionTool);=0D =0D + if (!CompareGuid (=0D + EfiGuid,=0D + &gEfiCrc32GuidedSectionExtractionProtocolGuid=0D + )=0D + ) {=0D + DataOffset -=3D 4;=0D + }=0D Status =3D=0D PutFileImage (=0D ToolInputFile,=0D --=20 2.25.1