Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPkg/SemihostFs: Fixed DataAbort in Semihosting File System 

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13501 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2012-07-04 20:22:02 +00:00
parent 7422411e38
commit 3bb46df2a3
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
View File

@ -263,18 +263,22 @@ FileDelete (
Fcb = SEMIHOST_FCB_FROM_THIS(File); Fcb = SEMIHOST_FCB_FROM_THIS(File);
// Get the filename from the Fcb if (!Fcb->IsRoot) {
NameSize = AsciiStrLen (Fcb->FileName); // Get the filename from the Fcb
FileName = AllocatePool (NameSize + 1); NameSize = AsciiStrLen (Fcb->FileName);
FileName = AllocatePool (NameSize + 1);
AsciiStrCpy (FileName, Fcb->FileName); AsciiStrCpy (FileName, Fcb->FileName);
// Close the file if it's open. Disregard return status, // Close the file if it's open. Disregard return status,
// since it might give an error if the file isn't open. // since it might give an error if the file isn't open.
File->Close (File); File->Close (File);
// Call the semihost interface to delete the file. // Call the semihost interface to delete the file.
Status = SemihostFileRemove (FileName); Status = SemihostFileRemove (FileName);
} else {
Status = EFI_UNSUPPORTED;
}
return Status; return Status;
} }
@ -358,14 +362,19 @@ FileSetPosition (
Fcb = SEMIHOST_FCB_FROM_THIS(File); Fcb = SEMIHOST_FCB_FROM_THIS(File);
Status = SemihostFileLength (Fcb->SemihostHandle, &Length); if (!Fcb->IsRoot) {
if (!EFI_ERROR(Status) && (Length < Position)) { Status = SemihostFileLength (Fcb->SemihostHandle, &Length);
Position = Length; if (!EFI_ERROR(Status) && (Length < Position)) {
} Position = Length;
}
Status = SemihostFileSeek (Fcb->SemihostHandle, (UINT32)Position); Status = SemihostFileSeek (Fcb->SemihostHandle, (UINT32)Position);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
Fcb->Position = Position;
}
} else {
Fcb->Position = Position; Fcb->Position = Position;
Status = EFI_SUCCESS;
} }
return Status; return Status;