From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::241; helo=mail-it0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x241.google.com (mail-it0-x241.google.com [IPv6:2607:f8b0:4001:c0b::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F4D42214E324 for ; Mon, 11 Dec 2017 10:17:25 -0800 (PST) Received: by mail-it0-x241.google.com with SMTP id t1so18074233ite.5 for ; Mon, 11 Dec 2017 10:22:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=DuasknkYi9lS/8nI4+Y9NyguLLKSS4aw35BmgOvMPR0=; b=Ccs/rliAVDmgUWtUaq6klkoyVn2IM+zNeBh8NTq4jcVo+T63fPyS0LUxLDrbrsZVVC 6NxCjnTVCIhtnw1uZYF6Aa/EECSsa9PVKduKY8XSeHMaMtOsCIIF6rz0zdAukYVYsE36 Sc8yiHH8WoLRUG5msIIqwqp+Y4iB9UtXicNfs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=DuasknkYi9lS/8nI4+Y9NyguLLKSS4aw35BmgOvMPR0=; b=ue3udPEA6j3M4GLQlH4po2BaS/G0zalpM7+1bQkE26XPD0I0A/CsqLkYadIWxYEseK DP42SzQMkB2a8gl6J+2aoMffcZtjt7ybZEh233limXPFRZlmWxlwkq8OZgFFqLaqp+hv L1pfYJgu1KE61vU1qt1SneOCNbFE+NsDEHUBxdqza2sdQzKjhpslhweLHcPHDw1fDuxg 7DMcEcHDnQJLZiStJbU5gBHqDC/c5mVEAKDMlA5XFJl9C1CSj0Hxa7d7cc3DGQf9JoyH rKNqEW0hlewuPKoFckj42LxfYne/7qHClZURC57RZQpvTOgJ/KCR0XkHF+iLvQ+Qm/cY mTxQ== X-Gm-Message-State: AKGB3mIvKxr5PkIe02jWT7ug8haYRkgyZF0XzNxbYmGCJBzFLs3rWKtV K4PU4SF/DqpmOco7FDSa4MN0IoHbOduOWEK2qUR2RL4o X-Google-Smtp-Source: ACJfBov6SVVNsDcC49JfmeMTzTL02+4KTQ/WIqHVQPooWnqDRLSVyZXpWzgLEKxl6Ic+A5q6aWivKQeKjJbisZwpWq0= X-Received: by 10.107.2.137 with SMTP id 131mr1807940ioc.186.1513016522603; Mon, 11 Dec 2017 10:22:02 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Mon, 11 Dec 2017 10:22:02 -0800 (PST) In-Reply-To: References: From: Ard Biesheuvel Date: Mon, 11 Dec 2017 18:22:02 +0000 Message-ID: To: Michael Zimmermann Cc: edk2-devel-01 , Leif Lindholm Subject: Re: [PATCH] EmbeddedPkg/PrePiLib: add support for v2 sections X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2017 18:17:25 -0000 Content-Type: text/plain; charset="UTF-8" On 11 December 2017 at 07:39, Michael Zimmermann wrote: > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael Zimmermann Thanks a lot for fixing this! Reviewed-by: Ard Biesheuvel > --- > EmbeddedPkg/Library/PrePiLib/FwVol.c | 63 ++++++++++++++++---- > 1 file changed, 51 insertions(+), 12 deletions(-) > > diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c > b/EmbeddedPkg/Library/PrePiLib/FwVol.c > index 530fc15dc..d513de351 100644 > --- a/EmbeddedPkg/Library/PrePiLib/FwVol.c > +++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c > @@ -296,35 +296,61 @@ FfsProcessSection ( > UINT32 SectionLength; > UINT32 ParsedLength; > EFI_COMPRESSION_SECTION *CompressionSection; > + EFI_COMPRESSION_SECTION2 *CompressionSection2; > UINT32 DstBufferSize; > VOID *ScratchBuffer; > UINT32 ScratchBufferSize; > VOID *DstBuffer; > UINT16 SectionAttribute; > UINT32 AuthenticationStatus; > + CHAR8 *CompressedData; > + UINTN CompressedDataLength; > > > *OutputBuffer = NULL; > ParsedLength = 0; > Status = EFI_NOT_FOUND; > while (ParsedLength < SectionSize) { > + if (IS_SECTION2 (Section)) { > + ASSERT (SECTION2_SIZE (Section) > 0x00FFFFFF); > + } > + > if (Section->Type == SectionType) { > - *OutputBuffer = (VOID *)(Section + 1); > + if (IS_SECTION2 (Section)) { > + *OutputBuffer = (VOID *)((UINT8 *) Section + sizeof > (EFI_COMMON_SECTION_HEADER2)); > + } else { > + *OutputBuffer = (VOID *)((UINT8 *) Section + sizeof > (EFI_COMMON_SECTION_HEADER)); > + } > > return EFI_SUCCESS; > } else if ((Section->Type == EFI_SECTION_COMPRESSION) || (Section->Type > == EFI_SECTION_GUID_DEFINED)) { > > if (Section->Type == EFI_SECTION_COMPRESSION) { > - CompressionSection = (EFI_COMPRESSION_SECTION *) Section; > - SectionLength = *(UINT32 *)Section->Size & 0x00FFFFFF; > - > - if (CompressionSection->CompressionType != > EFI_STANDARD_COMPRESSION) { > - return EFI_UNSUPPORTED; > + if (IS_SECTION2 (Section)) { > + CompressionSection2 = (EFI_COMPRESSION_SECTION2 *) Section; > + SectionLength = SECTION2_SIZE (Section); > + > + if (CompressionSection2->CompressionType != > EFI_STANDARD_COMPRESSION) { > + return EFI_UNSUPPORTED; > + } > + > + CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION2 *) Section > + 1); > + CompressedDataLength = (UINT32) SectionLength - sizeof > (EFI_COMPRESSION_SECTION2); > + } else { > + CompressionSection = (EFI_COMPRESSION_SECTION *) Section; > + SectionLength = SECTION_SIZE (Section); > + > + if (CompressionSection->CompressionType != > EFI_STANDARD_COMPRESSION) { > + return EFI_UNSUPPORTED; > + } > + > + CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + > 1); > + CompressedDataLength = (UINT32) SectionLength - sizeof > (EFI_COMPRESSION_SECTION); > } > > Status = UefiDecompressGetInfo ( > - (UINT8 *) ((EFI_COMPRESSION_SECTION *) Section + 1), > - (UINT32) SectionLength - sizeof > (EFI_COMPRESSION_SECTION), > + CompressedData, > + CompressedDataLength, > &DstBufferSize, > &ScratchBufferSize > ); > @@ -362,13 +388,23 @@ FfsProcessSection ( > // DstBuffer still is one section. Adjust DstBuffer offset, skip EFI > section header > // to make section data at page alignment. > // > - DstBuffer = (UINT8 *)DstBuffer + EFI_PAGE_SIZE - sizeof > (EFI_COMMON_SECTION_HEADER); > + if (IS_SECTION2 (Section)) > + DstBuffer = (UINT8 *)DstBuffer + EFI_PAGE_SIZE - sizeof > (EFI_COMMON_SECTION_HEADER2); > + else > + DstBuffer = (UINT8 *)DstBuffer + EFI_PAGE_SIZE - sizeof > (EFI_COMMON_SECTION_HEADER); > // > // Call decompress function > // > if (Section->Type == EFI_SECTION_COMPRESSION) { > + if (IS_SECTION2 (Section)) { > + CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION2 *) Section > + 1); > + } > + else { > + CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + > 1); > + } > + > Status = UefiDecompress ( > - (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + 1), > + CompressedData, > DstBuffer, > ScratchBuffer > ); > @@ -397,12 +433,15 @@ FfsProcessSection ( > } > } > > + if (IS_SECTION2 (Section)) { > + SectionLength = SECTION2_SIZE (Section); > + } else { > + SectionLength = SECTION_SIZE (Section); > + } > // > - // Size is 24 bits wide so mask upper 8 bits. > // SectionLength is adjusted it is 4 byte aligned. > // Go to the next section > // > - SectionLength = *(UINT32 *)Section->Size & 0x00FFFFFF; > SectionLength = GET_OCCUPIED_SIZE (SectionLength, 4); > ASSERT (SectionLength != 0); > ParsedLength += SectionLength; > -- > 2.15.1