sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance FV2.ReadSection() to read GUIDED section raw data when its extraction guided protocol doesn’t exist.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10703 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2010-07-28 01:12:22 +00:00
parent 1d6ee65f82
commit ab58ce18aa
1 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
View File

@ -528,8 +528,9 @@ CreateProtocolNotifyEvent (
} }
/** /**
RPN callback function. Removes a stale section stream and re-initializes it RPN callback function.
with an updated AuthenticationStatus. 1. Initialize the section stream when the GUIDED_SECTION_EXTRACTION_PROTOCOL is installed.
2. Removes a stale section stream and re-initializes it with an updated AuthenticationStatus.
@param Event The event that fired @param Event The event that fired
@param RpnContext A pointer to the context that allows us to identify @param RpnContext A pointer to the context that allows us to identify
@ -552,11 +553,14 @@ NotifyGuidedExtraction (
RPN_EVENT_CONTEXT *Context; RPN_EVENT_CONTEXT *Context;
Context = RpnContext; Context = RpnContext;
Status = EFI_SUCCESS;
Status = CloseSectionStream (&mSectionExtraction, Context->ChildNode->EncapsulatedStreamHandle); if (Context->ChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) {
Status = CloseSectionStream (&mSectionExtraction, Context->ChildNode->EncapsulatedStreamHandle);
}
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
// //
// The stream closed successfully, so re-open the stream with correct AuthenticationStatus // The stream is not initialized, open it.
// Or the stream closed successfully, so re-open the stream with correct AuthenticationStatus.
// //
GuidedHeader = (EFI_GUID_DEFINED_SECTION *) GuidedHeader = (EFI_GUID_DEFINED_SECTION *)
@ -839,45 +843,46 @@ CreateChildNode (
// //
if ((GuidedHeader->Attributes & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) == EFI_GUIDED_SECTION_PROCESSING_REQUIRED) { if ((GuidedHeader->Attributes & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) == EFI_GUIDED_SECTION_PROCESSING_REQUIRED) {
// //
// If the section REQUIRES an extraction protocol, then we're toast // If the section REQUIRES an extraction protocol, register for RPN
// when the required GUIDed extraction protocol becomes available.
// //
FreePool (*ChildNode); AuthenticationStatus = 0;
return EFI_PROTOCOL_ERROR; CreateGuidedExtractionRpnEvent (Stream, Node);
} } else {
//
// Figure out the proper authentication status
//
AuthenticationStatus = Stream->AuthenticationStatus;
if ((GuidedHeader->Attributes & EFI_GUIDED_SECTION_AUTH_STATUS_VALID) == EFI_GUIDED_SECTION_AUTH_STATUS_VALID) {
// //
// The local status of the new stream is contained in // Figure out the proper authentication status
// AuthenticaionStatus. This value needs to be ORed into the
// Aggregate bits also...
// //
AuthenticationStatus = Stream->AuthenticationStatus;
if ((GuidedHeader->Attributes & EFI_GUIDED_SECTION_AUTH_STATUS_VALID) == EFI_GUIDED_SECTION_AUTH_STATUS_VALID) {
//
// The local status of the new stream is contained in
// AuthenticaionStatus. This value needs to be ORed into the
// Aggregate bits also...
//
//
// Clear out and initialize the local status
//
AuthenticationStatus &= ~EFI_LOCAL_AUTH_STATUS_ALL;
AuthenticationStatus |= EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED | EFI_LOCAL_AUTH_STATUS_NOT_TESTED;
//
// OR local status into aggregate status
//
AuthenticationStatus |= AuthenticationStatus >> 16;
}
// SectionLength = SECTION_SIZE (GuidedHeader);
// Clear out and initialize the local status Status = OpenSectionStreamEx (
// SectionLength - GuidedHeader->DataOffset,
AuthenticationStatus &= ~EFI_LOCAL_AUTH_STATUS_ALL; (UINT8 *) GuidedHeader + GuidedHeader->DataOffset,
AuthenticationStatus |= EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED | EFI_LOCAL_AUTH_STATUS_NOT_TESTED; TRUE,
// AuthenticationStatus,
// OR local status into aggregate status &Node->EncapsulatedStreamHandle
// );
AuthenticationStatus |= AuthenticationStatus >> 16; if (EFI_ERROR (Status)) {
} FreePool (Node);
return Status;
SectionLength = SECTION_SIZE (GuidedHeader); }
Status = OpenSectionStreamEx (
SectionLength - GuidedHeader->DataOffset,
(UINT8 *) GuidedHeader + GuidedHeader->DataOffset,
TRUE,
AuthenticationStatus,
&Node->EncapsulatedStreamHandle
);
if (EFI_ERROR (Status)) {
FreePool (Node);
return Status;
} }
} }
@ -1026,6 +1031,13 @@ FindChildNode (
} else { } else {
ErrorStatus = Status; ErrorStatus = Status;
} }
} else if ((CurrentChildNode->Type == EFI_SECTION_GUID_DEFINED) && (SearchType != EFI_SECTION_GUID_DEFINED)) {
//
// When Node Type is GUIDED section, but Node has no encapsulated data, Node data should not be parsed
// because a required GUIDED section extraction protocol does not exist.
// If SearchType is not GUIDED section, EFI_PROTOCOL_ERROR should return.
//
ErrorStatus = EFI_PROTOCOL_ERROR;
} }
if (!IsNodeAtEnd (&SourceStream->Children, &CurrentChildNode->Link)) { if (!IsNodeAtEnd (&SourceStream->Children, &CurrentChildNode->Link)) {