diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2020-12-16 22:11:11 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-12-21 17:16:23 +0000 |
| commit | 7a7752095c172b381595da5247071635c7e496d5 (patch) | |
| tree | 9aabae34c074f88b21b00ba871ce085f0e722438 /OvmfPkg | |
| parent | 1c05df69984d3f515be991863f69c379e7dc9cba (diff) | |
| download | edk2-7a7752095c172b381595da5247071635c7e496d5.tar.gz | |
OvmfPkg/VirtioFsDxe: convert FUSE dirent filename to EFI_FILE_INFO
Introduce the VirtioFsFuseDirentPlusToEfiFileInfo() function, for
converting the VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE filename byte array to
EFI_FILE_INFO.
This new function updates those EFI_FILE_INFO fields (Size, FileName) that
the earlier helper function VirtioFsFuseAttrToEfiFileInfo() does not set.
Both functions together will be able to fill in EFI_FILE_INFO completely,
from FUSE_READDIRPLUS.
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3097
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20201216211125.19496-35-lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/VirtioFsDxe/Helpers.c | 79 | ||||
| -rw-r--r-- | OvmfPkg/VirtioFsDxe/VirtioFsDxe.h | 6 |
2 files changed, 85 insertions, 0 deletions
diff --git a/OvmfPkg/VirtioFsDxe/Helpers.c b/OvmfPkg/VirtioFsDxe/Helpers.c index 5c3e990add..dab8844f99 100644 --- a/OvmfPkg/VirtioFsDxe/Helpers.c +++ b/OvmfPkg/VirtioFsDxe/Helpers.c @@ -1900,3 +1900,82 @@ VirtioFsFuseAttrToEfiFileInfo ( return EFI_SUCCESS;
}
+
+/**
+ Convert a VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE filename to an EFI_FILE_INFO
+ filename.
+
+ @param[in] FuseDirent The VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE object to
+ convert the filename byte array from. The caller is
+ responsible for ensuring that FuseDirent->Namelen
+ describe valid storage.
+
+ @param[in,out] FileInfo The EFI_FILE_INFO structure to modify. On input, the
+ caller is responsible for setting FileInfo->Size
+ according to the allocated size. On successful
+ return, FileInfo->Size is reduced to reflect the
+ filename converted into FileInfo->FileName.
+ FileInfo->FileName is set from the filename byte
+ array that directly follows the FuseDirent header
+ object. Fields other than FileInfo->Size and
+ FileInfo->FileName are not modified.
+
+ @retval EFI_SUCCESS Conversion successful.
+
+ @retval EFI_INVALID_PARAMETER VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE()
+ returns zero for FuseDirent->Namelen.
+
+ @retval EFI_BUFFER_TOO_SMALL On input, FileInfo->Size does not provide
+ enough room for converting the filename byte
+ array from FuseDirent.
+
+ @retval EFI_UNSUPPORTED The FuseDirent filename byte array contains a
+ byte that falls outside of the printable ASCII
+ range, or is a forward slash or a backslash.
+**/
+EFI_STATUS
+VirtioFsFuseDirentPlusToEfiFileInfo (
+ IN VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *FuseDirent,
+ IN OUT EFI_FILE_INFO *FileInfo
+ )
+{
+ UINTN DirentSize;
+ UINTN FileInfoSize;
+ UINT8 *DirentName;
+ UINT32 Idx;
+
+ DirentSize = VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE (FuseDirent->Namelen);
+ if (DirentSize == 0) {
+ return EFI_INVALID_PARAMETER;
+ }
+ //
+ // We're now safe from overflow in the calculation below.
+ //
+ FileInfoSize = (OFFSET_OF (EFI_FILE_INFO, FileName) +
+ ((UINTN)FuseDirent->Namelen + 1) * sizeof (CHAR16));
+ if (FileInfoSize > FileInfo->Size) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
+ //
+ // Convert the name.
+ //
+ DirentName = (UINT8 *)(FuseDirent + 1);
+ for (Idx = 0; Idx < FuseDirent->Namelen; Idx++) {
+ UINT8 NameByte;
+
+ NameByte = DirentName[Idx];
+ if (NameByte < 0x20 || NameByte > 0x7E ||
+ NameByte == '/' || NameByte == '\\') {
+ return EFI_UNSUPPORTED;
+ }
+ FileInfo->FileName[Idx] = (CHAR16)NameByte;
+ }
+ FileInfo->FileName[Idx++] = L'\0';
+ //
+ // Set the (possibly reduced) size.
+ //
+ FileInfo->Size = FileInfoSize;
+
+ return EFI_SUCCESS;
+}
diff --git a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h index f5501af7d0..2b419048c2 100644 --- a/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h +++ b/OvmfPkg/VirtioFsDxe/VirtioFsDxe.h @@ -248,6 +248,12 @@ VirtioFsFuseAttrToEfiFileInfo ( OUT EFI_FILE_INFO *FileInfo
);
+EFI_STATUS
+VirtioFsFuseDirentPlusToEfiFileInfo (
+ IN VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *FuseDirent,
+ IN OUT EFI_FILE_INFO *FileInfo
+ );
+
//
// Wrapper functions for FUSE commands (primitives).
//
|