From nobody Tue May 7 08:39:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91942+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91942+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1659022018; cv=none; d=zohomail.com; s=zohoarc; b=KHriZIeMubrVuzb9y7kbiv5r3UZoUnZMmlp8/hhvM5Sg3IZ636OwpPzmKJxut/FWdGO8ho+hI+1blWNBM2e7piR3Xodl+Zlwog8E75eqAXu50yCQc1ocLm45JcRDLmdKB+5wHUot0mBHheLpL3LH9yf5zYImtAiI2Zvptk7jThY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659022018; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=URdW2NQxpYc/c6LQG+hnvdC1CIqKCrzjpbLO6SgCVzg=; b=JcECPBsRV654k0fiUPJsj/d405gUevyB0vw6HWyiwhSaqZSEbMVSWpEtYXDyopp0aOHSZNX1IN4mn/5nbz9wH3ggHaELjv7SBOTZ2CIpeBMKbc36ySCukhxY0J4ZuWIUA8ibiTmlFju7EgSGmwSmTlxQu08XOYB0dtROAUNXlEA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91942+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1659022018748905.6021719855166; Thu, 28 Jul 2022 08:26:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lwLcYY1788612xFO8zBOOYoQ; Thu, 28 Jul 2022 08:26:58 -0700 X-Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mx.groups.io with SMTP id smtpd.web10.33918.1659022017349263158 for ; Thu, 28 Jul 2022 08:26:57 -0700 X-Received: by mail-lf1-f41.google.com with SMTP id m12so3359199lfj.4 for ; Thu, 28 Jul 2022 08:26:57 -0700 (PDT) X-Gm-Message-State: eAofn21vAtJVfe6wpnA6Z82wx1787277AA= X-Google-Smtp-Source: AGRyM1ucB1WnW20TNfbdYXfWBGlgKsxmjl+N/0iNpAumoaJVN2Yf51jnLrnwJa/GiTAgBXdZLFwwnA== X-Received: by 2002:a05:6512:3691:b0:48a:81ff:343d with SMTP id d17-20020a056512369100b0048a81ff343dmr10188255lfs.553.1659022015093; Thu, 28 Jul 2022 08:26:55 -0700 (PDT) X-Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id j1-20020ac253a1000000b0048aace12740sm237821lfh.270.2022.07.28.08.26.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2022 08:26:54 -0700 (PDT) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-devel] [edk2-platforms][PATCH v4 1/2] Ext4Pkg: Add symbolic links support Date: Thu, 28 Jul 2022 21:26:43 +0600 Message-Id: <20220728152644.11435-2-savvamtr@gmail.com> In-Reply-To: <20220728152644.11435-1-savvamtr@gmail.com> References: <20220728152644.11435-1-savvamtr@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,savvamtr@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659022018; bh=HSX2r7asVqU4glDR236UwMAk/n0pdXq+QWwJu5B+tKo=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Ha7B+95KlCoTxQIzLPs8dTKpcUddBxj1/2eVHI4Mb0n27Z2iMGs5joqfUhTX2Mw1Y1v EXlU+JnWzAKNlVSwsqhavTZTlKVoCZ1mXhUUww+zBqVNK+BA/BcR6WH/ELvU7z+GNEEwu jEPITEgA8DqSwJSh/GC+X0rmh7FsEPjBFgY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659022021074100003 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3677 Provided support for symlink file type. Added routine which allows reading and following them through recursive open() call. As a security meausure implemented simple symlink loop check with nest level limit equal 8. Also this patch moves Ext4Open functionality to internal routine. Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Signed-off-by: Savva Mitrofanov Reviewed-by: Marvin H=C3=A4user as-is or with my comme= nts addressed, either works. --- Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h | 13 +- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 98 +++++- Features/Ext4Pkg/Ext4Dxe/File.c | 359 ++++++++++++++++++-- Features/Ext4Pkg/Ext4Dxe/Inode.c | 53 +++ 4 files changed, 485 insertions(+), 38 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h b/Features/Ext4Pkg/Ext4Dxe= /Ext4Disk.h index a55cd2fa68ad..a73e3f8622f1 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h @@ -171,7 +171,7 @@ #define EXT4_DIRTY_FL 0x00000100 #define EXT4_COMPRBLK_FL 0x00000200 #define EXT4_NOCOMPR_FL 0x00000400 -#define EXT4_ECOMPR_FL 0x00000800 +#define EXT4_ENCRYPT_FL 0x00000800 #define EXT4_BTREE_FL 0x00001000 #define EXT4_INDEX_FL 0x00002000 #define EXT4_JOURNAL_DATA_FL 0x00004000 @@ -332,11 +332,12 @@ STATIC_ASSERT ( "ext4 block group descriptor struct has incorrect size" ); =20 -#define EXT4_DBLOCKS 12 -#define EXT4_IND_BLOCK 12 -#define EXT4_DIND_BLOCK 13 -#define EXT4_TIND_BLOCK 14 -#define EXT4_NR_BLOCKS 15 +#define EXT4_DBLOCKS 12 +#define EXT4_IND_BLOCK 12 +#define EXT4_DIND_BLOCK 13 +#define EXT4_TIND_BLOCK 14 +#define EXT4_NR_BLOCKS 15 +#define EXT4_FAST_SYMLINK_MAX_SIZE EXT4_NR_BLOCKS * sizeof(UINT32) =20 #define EXT4_GOOD_OLD_INODE_SIZE 128 =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/= Ext4Dxe.h index b1508482b0a7..c1df9d1149e4 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -31,7 +31,9 @@ =20 #include "Ext4Disk.h" =20 +#define SYMLOOP_MAX 8 #define EXT4_NAME_MAX 255 +#define EFI_PATH_MAX 4096 =20 #define EXT4_DRIVER_VERSION 0x0000 =20 @@ -324,11 +326,11 @@ number of read bytes. **/ EFI_STATUS Ext4Read ( - IN EXT4_PARTITION *Partition, - IN EXT4_FILE *File, - OUT VOID *Buffer, - IN UINT64 Offset, - IN OUT UINTN *Length + IN EXT4_PARTITION *Partition, + IN EXT4_FILE *File, + OUT VOID *Buffer, + IN UINT64 Offset, + IN OUT UINTN *Length ); =20 /** @@ -368,6 +370,7 @@ struct _Ext4File { =20 UINT64 OpenMode; UINT64 Position; + UINT32 SymLoops; =20 EXT4_PARTITION *Partition; =20 @@ -497,6 +500,45 @@ Ext4SetupFile ( IN EXT4_PARTITION *Partition ); =20 +/** + Opens a new file relative to the source file's location. + + @param[out] FoundFile A pointer to the location to return the opened ha= ndle for the new + file. + @param[in] Source A pointer to the EXT4_FILE instance that is the f= ile + handle to the source location. This would typical= ly be an open + handle to a directory. + @param[in] FileName The Null-terminated string of the name of the fil= e to be opened. + The file name may contain the following path modi= fiers: "\", ".", + and "..". + @param[in] OpenMode The mode to open the file. The only valid combina= tions that the + file may be opened with are: Read, Read/Write, or= Create/Read/Write. + @param[in] Attributes Only valid for EFI_FILE_MODE_CREATE, in which cas= e these are the + attribute bits for the newly created file. + + @retval EFI_SUCCESS The file was opened. + @retval EFI_NOT_FOUND The specified file could not be found on th= e device. + @retval EFI_NO_MEDIA The device has no medium. + @retval EFI_MEDIA_CHANGED The device has a different medium in it or = the medium is no + longer supported. + @retval EFI_DEVICE_ERROR The device reported an error. + @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted. + @retval EFI_WRITE_PROTECTED An attempt was made to create a file, or op= en a file for write + when the media is write-protected. + @retval EFI_ACCESS_DENIED The service denied access to the file. + @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open= the file. + @retval EFI_VOLUME_FULL The volume is full. + +**/ +EFI_STATUS +Ext4OpenInternal ( + OUT EXT4_FILE **FoundFile, + IN EXT4_FILE *Source, + IN CHAR16 *FileName, + IN UINT64 OpenMode, + IN UINT64 Attributes + ); + /** Closes a file. =20 @@ -774,6 +816,30 @@ Ext4FileIsDir ( IN CONST EXT4_FILE *File ); =20 +/** + Checks if a file is a symlink. + + @param[in] File Pointer to the opened file. + + @return BOOLEAN Whether file is a symlink +**/ +BOOLEAN +Ext4FileIsSymlink ( + IN CONST EXT4_FILE *File + ); + +/** + Detects if a symlink is a fast symlink. + + @param[in] File Pointer to the opened file. + + @return BOOLEAN Whether symlink is a fast symlink +**/ +BOOLEAN +Ext4SymlinkIsFastSymlink ( + IN CONST EXT4_FILE *File + ); + /** Checks if a file is a regular file. @param[in] File Pointer to the opened file. @@ -797,7 +863,7 @@ Ext4FileIsReg ( it's a regular file or a directory, since most other file types don't make sense under UEFI. **/ -#define Ext4FileIsOpenable(File) (Ext4FileIsReg(File) || Ext4FileIsDir(Fi= le)) +#define Ext4FileIsOpenable(File) (Ext4FileIsReg (File) || Ext4FileIsDir (= File) || Ext4FileIsSymlink (File)) =20 #define EXT4_INODE_HAS_FIELD(Inode, Field) = \ (Inode->i_extra_isize + EXT4_GOOD_OLD_INODE_SIZE >=3D = \ @@ -935,6 +1001,26 @@ Ext4ReadDir ( IN OUT UINTN *OutLength ); =20 +/** + Reads a symlink file. + + @param[in] Partition Pointer to the ext4 partition. + @param[in] File Pointer to the open symlink file. + @param[out] Symlink Pointer to the output unicode symlink string. + + @retval EFI_SUCCESS Symlink was read. + @retval EFI_ACCESS_DENIED Symlink is encrypted. + @retval EFI_OUT_OF_RESOURCES Memory allocation error. + @retval EFI_INVALID_PARAMETER Symlink path has incorrect length + @retval EFI_VOLUME_CORRUPTED Symlink read block size differ from inode = value +**/ +EFI_STATUS +Ext4ReadSymlink ( + IN EXT4_PARTITION *Partition, + IN EXT4_FILE *File, + OUT CHAR16 **Symlink + ); + /** Initialises the (empty) extents map, that will work as a cache of exten= ts. =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/Fil= e.c index ff1746d5640a..ae9230d6422b 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -134,14 +134,224 @@ Ext4DirCanLookup ( return (File->Inode->i_mode & EXT4_INO_PERM_EXEC_OWNER) =3D=3D EXT4_INO_= PERM_EXEC_OWNER; } =20 +/** + Reads a fast symlink file. + + @param[in] Partition Pointer to the ext4 partition. + @param[in] File Pointer to the open symlink file. + @param[out] AsciiSymlink Pointer to the output ascii symlink str= ing. + @param[out] AsciiSymlinkSize Pointer to the output ascii symlink str= ing length. + + @retval EFI_SUCCESS Fast symlink was read. + @retval EFI_OUT_OF_RESOURCES Memory allocation error. +**/ +STATIC +EFI_STATUS +Ext4ReadFastSymlink ( + IN EXT4_PARTITION *Partition, + IN EXT4_FILE *File, + OUT CHAR8 **AsciiSymlink, + OUT UINT32 *AsciiSymlinkSize + ) +{ + UINT32 SymlinkSize; + CHAR8 *AsciiSymlinkTmp; + // + // Fast-symlink's EXT4_INODE_SIZE is not necessarily validated when we c= hecked it in + // Ext4SymlinkIsFastSymlink(), so truncate if necessary. + // + SymlinkSize =3D (UINT32)MIN (EXT4_INODE_SIZE (File->Inode), EXT4_FAST_SY= MLINK_MAX_SIZE); + + AsciiSymlinkTmp =3D AllocatePool (SymlinkSize + 1); + if (AsciiSymlinkTmp =3D=3D NULL) { + DEBUG ((DEBUG_FS, "[ext4] Failed to allocate symlink ascii string buff= er\n")); + return EFI_OUT_OF_RESOURCES; + } + + CopyMem (AsciiSymlinkTmp, File->Inode->i_data, SymlinkSize); + + // + // Add null-terminator + // + AsciiSymlinkTmp[SymlinkSize] =3D '\0'; + + *AsciiSymlink =3D AsciiSymlinkTmp; + *AsciiSymlinkSize =3D SymlinkSize + 1; + + return EFI_SUCCESS; +} + +/** + Reads a slow symlink file. + + @param[in] Partition Pointer to the ext4 partition. + @param[in] File Pointer to the open symlink file. + @param[out] AsciiSymlink Pointer to the output ascii symlink str= ing. + @param[out] AsciiSymlinkSize Pointer to the output ascii symlink str= ing length. + + @retval EFI_SUCCESS Slow symlink was read. + @retval EFI_OUT_OF_RESOURCES Memory allocation error. + @retval EFI_INVALID_PARAMETER Slow symlink path has incorrect length + @retval EFI_VOLUME_CORRUPTED Symlink read block size differ from inode = value +**/ +STATIC +EFI_STATUS +Ext4ReadSlowSymlink ( + IN EXT4_PARTITION *Partition, + IN EXT4_FILE *File, + OUT CHAR8 **AsciiSymlink, + OUT UINT32 *AsciiSymlinkSize + ) +{ + EFI_STATUS Status; + CHAR8 *SymlinkTmp; + UINT64 SymlinkSizeTmp; + UINT32 SymlinkAllocateSize; + UINTN ReadSize; + + SymlinkSizeTmp =3D EXT4_INODE_SIZE (File->Inode); + + // + // Allocate EXT4_INODE_SIZE + 1 + // + if (SymlinkSizeTmp > EFI_PATH_MAX - 1) { + DEBUG (( + DEBUG_FS, + "[ext4] Error! Symlink path maximum length was hit!\n" + )); + return EFI_INVALID_PARAMETER; + } + + SymlinkAllocateSize =3D (UINT32)SymlinkSizeTmp + 1; + + SymlinkTmp =3D AllocatePool (SymlinkAllocateSize); + if (SymlinkTmp =3D=3D NULL) { + DEBUG ((DEBUG_FS, "[ext4] Failed to allocate symlink ascii string buff= er\n")); + return EFI_OUT_OF_RESOURCES; + } + + ReadSize =3D (UINTN)SymlinkSizeTmp; + Status =3D Ext4Read (Partition, File, SymlinkTmp, File->Position, &Rea= dSize); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_FS, "[ext4] Failed to read symlink from blocks with Stat= us %r\n", Status)); + FreePool (SymlinkTmp); + return Status; + } + + File->Position +=3D ReadSize; + + // + // Add null-terminator + // + SymlinkTmp[SymlinkSizeTmp] =3D '\0'; + + if (SymlinkSizeTmp !=3D ReadSize) { + DEBUG (( + DEBUG_FS, + "[ext4] Error! The sz of the read block doesn't match the value from= the inode!\n" + )); + return EFI_VOLUME_CORRUPTED; + } + + *AsciiSymlinkSize =3D SymlinkAllocateSize; + *AsciiSymlink =3D SymlinkTmp; + + return EFI_SUCCESS; +} + +/** + Reads a symlink file. + + @param[in] Partition Pointer to the ext4 partition. + @param[in] File Pointer to the open symlink file. + @param[out] Symlink Pointer to the output unicode symlink string. + + @retval EFI_SUCCESS Symlink was read. + @retval EFI_ACCESS_DENIED Symlink is encrypted. + @retval EFI_OUT_OF_RESOURCES Memory allocation error. + @retval EFI_INVALID_PARAMETER Symlink path has incorrect length + @retval EFI_VOLUME_CORRUPTED Symlink read block size differ from inode = value +**/ +EFI_STATUS +Ext4ReadSymlink ( + IN EXT4_PARTITION *Partition, + IN EXT4_FILE *File, + OUT CHAR16 **Symlink + ) +{ + EFI_STATUS Status; + CHAR8 *SymlinkTmp; + UINT32 SymlinkSize; + CHAR16 *Symlink16Tmp; + CHAR16 *Needle; + + // + // Assume that we alread read Inode via Ext4ReadInode + // Skip reading, just check encryption flag + // + if ((File->Inode->i_flags & EXT4_ENCRYPT_FL) !=3D 0) { + DEBUG ((DEBUG_FS, "[ext4] Error, symlink is encrypted\n")); + return EFI_ACCESS_DENIED; + } + + if (Ext4SymlinkIsFastSymlink (File)) { + Status =3D Ext4ReadFastSymlink (Partition, File, &SymlinkTmp, &Symlink= Size); + } else { + Status =3D Ext4ReadSlowSymlink (Partition, File, &SymlinkTmp, &Symlink= Size); + } + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_FS, "[ext4] Symlink read error with Status %r\n", Status= )); + return Status; + } + + Symlink16Tmp =3D AllocateZeroPool (SymlinkSize * sizeof (CHAR16)); + if (Symlink16Tmp =3D=3D NULL) { + DEBUG ((DEBUG_FS, "[ext4] Failed to allocate symlink unicode string bu= ffer\n")); + FreePool (SymlinkTmp); + return EFI_OUT_OF_RESOURCES; + } + + Status =3D AsciiStrToUnicodeStrS ( + SymlinkTmp, + Symlink16Tmp, + SymlinkSize + ); + + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_FS, + "[ext4] Failed to convert ascii symlink to unicode with Status %r\n", + Status + )); + FreePool (Symlink16Tmp); + FreePool (SymlinkTmp); + return Status; + } + + // + // Convert to UEFI slashes + // + for (Needle =3D Symlink16Tmp; *Needle !=3D L'\0'; Needle++) { + if (*Needle =3D=3D L'/') { + *Needle =3D L'\\'; + } + } + + *Symlink =3D Symlink16Tmp; + + FreePool (SymlinkTmp); + return Status; +} + /** Opens a new file relative to the source file's location. =20 - @param[in] This A pointer to the EFI_FILE_PROTOCOL instance that = is the file + @param[out] FoundFile A pointer to the location to return the opened ha= ndle for the new + file. + @param[in] Source A pointer to the EXT4_FILE instance that is the f= ile handle to the source location. This would typical= ly be an open handle to a directory. - @param[out] NewHandle A pointer to the location to return the opened ha= ndle for the new - file. @param[in] FileName The Null-terminated string of the name of the fil= e to be opened. The file name may contain the following path modi= fiers: "\", ".", and "..". @@ -165,13 +375,12 @@ Ext4DirCanLookup ( =20 **/ EFI_STATUS -EFIAPI -Ext4Open ( - IN EFI_FILE_PROTOCOL *This, - OUT EFI_FILE_PROTOCOL **NewHandle, - IN CHAR16 *FileName, - IN UINT64 OpenMode, - IN UINT64 Attributes +Ext4OpenInternal ( + OUT EXT4_FILE **FoundFile, + IN EXT4_FILE *Source, + IN CHAR16 *FileName, + IN UINT64 OpenMode, + IN UINT64 Attributes ) { EXT4_FILE *Current; @@ -180,13 +389,14 @@ Ext4Open ( CHAR16 PathSegment[EXT4_NAME_MAX + 1]; UINTN Length; EXT4_FILE *File; + CHAR16 *Symlink; EFI_STATUS Status; =20 - Current =3D (EXT4_FILE *)This; + Current =3D Source; Partition =3D Current->Partition; Level =3D 0; =20 - DEBUG ((DEBUG_FS, "[ext4] Ext4Open %s\n", FileName)); + DEBUG ((DEBUG_FS, "[ext4] Ext4OpenInternal %s\n", FileName)); // If the path starts with a backslash, we treat the root directory as t= he base directory if (FileName[0] =3D=3D L'\\') { FileName++; @@ -194,6 +404,11 @@ Ext4Open ( } =20 while (FileName[0] !=3D L'\0') { + if (Partition->Root->SymLoops > SYMLOOP_MAX) { + DEBUG ((DEBUG_FS, "[ext4] Symloop limit is hit !\n")); + return EFI_ACCESS_DENIED; + } + // Discard leading path separators while (FileName[0] =3D=3D L'\\') { FileName++; @@ -238,18 +453,45 @@ Ext4Open ( } =20 // Check if this is a valid file to open in EFI - - // What to do with symlinks? They're nonsense when absolute but may - // be useful when they're relative. Right now, they're ignored, since = they - // bring a lot of trouble for something that's not as useful in our ca= se. - // If you want to link, use hard links. - if (!Ext4FileIsOpenable (File)) { Ext4CloseInternal (File); // This looks like an /okay/ status to return. return EFI_ACCESS_DENIED; } =20 + // + // Reading symlink and then trying to follow it + // + if (Ext4FileIsSymlink (File)) { + Partition->Root->SymLoops++; + DEBUG ((DEBUG_FS, "[ext4] File %s is symlink, trying to read it\n", = PathSegment)); + Status =3D Ext4ReadSymlink (Partition, File, &Symlink); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_FS, "[ext4] Error reading %s symlink!\n", PathSegmen= t)); + return Status; + } + + DEBUG ((DEBUG_FS, "[ext4] File %s is linked to %s\n", PathSegment, S= ymlink)); + // + // Close symlink file + // + Ext4CloseInternal (File); + // + // Open linked file by recursive call of Ext4OpenFile + // + Status =3D Ext4OpenInternal (FoundFile, Current, Symlink, OpenMode, = Attributes); + FreePool (Symlink); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_FS, "[ext4] Error opening linked file %s\n", Symlink= )); + return Status; + } + + // + // Set File to newly opened + // + File =3D *FoundFile; + } + if (Level !=3D 0) { // Careful not to close the base directory Ext4CloseInternal (Current); @@ -273,12 +515,75 @@ Ext4Open ( return EFI_ACCESS_DENIED; } =20 - *NewHandle =3D &Current->Protocol; + *FoundFile =3D Current; =20 DEBUG ((DEBUG_FS, "[ext4] Opened filename %s\n", Current->Dentry->Name)); return EFI_SUCCESS; } =20 +/** + Opens a new file relative to the source file's location. + @param[in] This A pointer to the EFI_FILE_PROTOCOL instance that = is the file + handle to the source location. This would typical= ly be an open + handle to a directory. + @param[out] NewHandle A pointer to the location to return the opened ha= ndle for the new + file. + @param[in] FileName The Null-terminated string of the name of the fil= e to be opened. + The file name may contain the following path modi= fiers: "\", ".", + and "..". + @param[in] OpenMode The mode to open the file. The only valid combina= tions that the + file may be opened with are: Read, Read/Write, or= Create/Read/Write. + @param[in] Attributes Only valid for EFI_FILE_MODE_CREATE, in which cas= e these are the + attribute bits for the newly created file. + @retval EFI_SUCCESS The file was opened. + @retval EFI_NOT_FOUND The specified file could not be found on th= e device. + @retval EFI_NO_MEDIA The device has no medium. + @retval EFI_MEDIA_CHANGED The device has a different medium in it or = the medium is no + longer supported. + @retval EFI_DEVICE_ERROR The device reported an error. + @retval EFI_VOLUME_CORRUPTED The file system structures are corrupted. + @retval EFI_WRITE_PROTECTED An attempt was made to create a file, or op= en a file for write + when the media is write-protected. + @retval EFI_ACCESS_DENIED The service denied access to the file. + @retval EFI_OUT_OF_RESOURCES Not enough resources were available to open= the file. + @retval EFI_VOLUME_FULL The volume is full. +**/ +EFI_STATUS +EFIAPI +Ext4Open ( + IN EFI_FILE_PROTOCOL *This, + OUT EFI_FILE_PROTOCOL **NewHandle, + IN CHAR16 *FileName, + IN UINT64 OpenMode, + IN UINT64 Attributes + ) +{ + EFI_STATUS Status; + EXT4_FILE *FoundFile; + EXT4_FILE *Source; + + Source =3D (EXT4_FILE *)This; + + // + // Reset SymLoops counter + // + Source->Partition->Root->SymLoops =3D 0; + + Status =3D Ext4OpenInternal ( + &FoundFile, + Source, + FileName, + OpenMode, + Attributes + ); + + if (!EFI_ERROR (Status)) { + *NewHandle =3D &FoundFile->Protocol; + } + + return Status; +} + /** Closes a specified file handle. =20 @@ -588,7 +893,7 @@ Ext4GetVolumeName ( =20 // s_volume_name is only valid on dynamic revision; old filesystems don'= t support this if (Partition->SuperBlock.s_rev_level =3D=3D EXT4_DYNAMIC_REV) { - CopyMem (TempVolName, (CONST CHAR8 *)Partition->SuperBlock.s_volume_na= me, 16); + CopyMem (TempVolName, Partition->SuperBlock.s_volume_name, 16); TempVolName[16] =3D '\0'; =20 Status =3D UTF8StrToUCS2 (TempVolName, &VolumeName); @@ -754,12 +1059,14 @@ Ext4GetInfo ( OUT VOID *Buffer ) { + EXT4_FILE *File; EXT4_PARTITION *Partition; =20 - Partition =3D ((EXT4_FILE *)This)->Partition; + File =3D (EXT4_FILE *)This; + Partition =3D File->Partition; =20 if (CompareGuid (InformationType, &gEfiFileInfoGuid)) { - return Ext4GetFileInfo ((EXT4_FILE *)This, Buffer, BufferSize); + return Ext4GetFileInfo (File, Buffer, BufferSize); } =20 if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) { @@ -870,12 +1177,12 @@ Ext4SetInfo ( ) { EXT4_FILE *File; - EXT4_PARTITION *Part; + EXT4_PARTITION *Partition; =20 - File =3D (EXT4_FILE *)This; - Part =3D File->Partition; + File =3D (EXT4_FILE *)This; + Partition =3D File->Partition; =20 - if (Part->ReadOnly) { + if (Partition->ReadOnly) { return EFI_WRITE_PROTECTED; } =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/Inode.c b/Features/Ext4Pkg/Ext4Dxe/In= ode.c index 831f5946e870..e7a6b3225709 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Inode.c +++ b/Features/Ext4Pkg/Ext4Dxe/Inode.c @@ -255,6 +255,59 @@ Ext4FileIsDir ( return (File->Inode->i_mode & EXT4_INO_TYPE_DIR) =3D=3D EXT4_INO_TYPE_DI= R; } =20 +/** + Checks if a file is a symlink. + + @param[in] File Pointer to the opened file. + + @return BOOLEAN Whether file is a symlink +**/ +BOOLEAN +Ext4FileIsSymlink ( + IN CONST EXT4_FILE *File + ) +{ + return (File->Inode->i_mode & EXT4_INO_TYPE_SYMLINK) =3D=3D EXT4_INO_TYP= E_SYMLINK; +} + +/** + Detects if a symlink is a fast symlink. + + @param[in] File Pointer to the opened file. + + @return BOOLEAN Whether symlink is a fast symlink +**/ +BOOLEAN +Ext4SymlinkIsFastSymlink ( + IN CONST EXT4_FILE *File + ) +{ + // + // Detection logic of the fast-symlink splits into two behaviors - old a= nd new. + // The old behavior is based on comparing the extended attribute blocks + // with the inode's i_blocks, and if it's zero we know the inode isn't s= toring + // the link in filesystem blocks, so we look to the inode->i_data. + // The new behavior is apparently needed only with the large EA inode fe= ature. + // In this case we check that inode size less than maximum fast symlink = size. + // So, we revert to the old behavior if the large EA inode feature is no= t set. + // + UINT32 FileAcl; + UINT32 ExtAttrBlocks; + + if ((File->Inode->i_flags & EXT4_EA_INODE_FL) =3D=3D 0) { + FileAcl =3D File->Inode->i_file_acl; + if (EXT4_IS_64_BIT (File->Partition)) { + FileAcl |=3D LShiftU64 (File->Inode->i_osd2.data_linux.l_i_file_acl_= high, 32); + } + + ExtAttrBlocks =3D FileAcl !=3D 0 ? (File->Partition->BlockSize >> 9) := 0; + + return File->Inode->i_blocks =3D=3D ExtAttrBlocks; + } + + return EXT4_INODE_SIZE (File->Inode) <=3D EXT4_FAST_SYMLINK_MAX_SIZE; +} + /** Checks if a file is a regular file. @param[in] File Pointer to the opened file. --=20 2.37.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91942): https://edk2.groups.io/g/devel/message/91942 Mute This Topic: https://groups.io/mt/92672600/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 08:39:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91943+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91943+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1659022026; cv=none; d=zohomail.com; s=zohoarc; b=ZdrN6Rq6AhLGQelbV9QWnJJczCUlqwe2DO2Yo7yqMwTRBWfYQxMmoGKRJnW26LxZwPBnDK8fb71CvB+LUvXHPBUckfTEEX10wBokTtam2vYpqSIrTc5L+PpxhaVY7GZp49jz9IMVUzsEc9z9DYvNXSRuhoNPlf1R68dUWLa/gM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659022026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=t/ynOhqZ0/tOVB7/Z5dD5aaDfWihpZkwQU7oNDMMrRU=; b=HwLheIHuUQmkpdP+YQ83oWuU2gAfGxjEAtBlv8DBztHTbAUnuxMyI3tjnEM0qXkK1ys2kyCQpPt66fsh80kiYDEi2r9iWvBBCAvJn29vXl3vhsl43f8zqIT5eXCTXp1qMDNKtn03/EwmGMuv0DnaKIscRGltR8Toj+fgO7rMViI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91943+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1659022026344285.497006958415; Thu, 28 Jul 2022 08:27:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Au2xYY1788612xQ9ZIyF6nOn; Thu, 28 Jul 2022 08:27:06 -0700 X-Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mx.groups.io with SMTP id smtpd.web12.33733.1659022019212136356 for ; Thu, 28 Jul 2022 08:26:59 -0700 X-Received: by mail-lj1-f176.google.com with SMTP id u17so2327381lji.5 for ; Thu, 28 Jul 2022 08:26:58 -0700 (PDT) X-Gm-Message-State: deUe0S1kztIyzGWZiWrhzGA4x1787277AA= X-Google-Smtp-Source: AGRyM1ub2nFzy6sMG/Y/FbRTkmC3it7+f4fBb7lO56fWVy438IKBs39KdPgGEUK7Nh6be/egck2NZA== X-Received: by 2002:a2e:be90:0:b0:25d:60eb:e4f4 with SMTP id a16-20020a2ebe90000000b0025d60ebe4f4mr9612187ljr.162.1659022017245; Thu, 28 Jul 2022 08:26:57 -0700 (PDT) X-Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id j1-20020ac253a1000000b0048aace12740sm237821lfh.270.2022.07.28.08.26.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2022 08:26:56 -0700 (PDT) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-devel] [edk2-platforms][PATCH v4 2/2] Ext4Pkg: Add base containing record macro for EXT4_FILE Date: Thu, 28 Jul 2022 21:26:44 +0600 Message-Id: <20220728152644.11435-3-savvamtr@gmail.com> In-Reply-To: <20220728152644.11435-1-savvamtr@gmail.com> References: <20220728152644.11435-1-savvamtr@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,savvamtr@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659022026; bh=uwZ3wd/So+ReT32gaYO0yPlu4WoEOAqYAaGkbsOaCSA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=e5ba75qcp0MTOU9Y7OdXKybAyLXJwE1k40IWTKCl6Rb4xyEz5/KPHMdX/ylFOkWqFm7 InQMgox6/DTihDdMKiv5SLIEWwlEEZiJrKbt8JerIz1zCS35QrqCkiKIs0RU8Sk9hUXcG HMjVi5GWG14cnJim8nDlYDaO1J7TU7LG4Xs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659022027101100001 Content-Type: text/plain; charset="utf-8" We shouldn't use direct casts, because in the future it could break the code, so using BASE_CR would be safe against possible structure changes and rearrangements Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Signed-off-by: Savva Mitrofanov Reviewed-by: Marvin H=C3=A4user --- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 2 ++ Features/Ext4Pkg/Ext4Dxe/File.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/= Ext4Dxe.h index c1df9d1149e4..1e63e6282fa5 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -382,6 +382,8 @@ struct _Ext4File { EXT4_DENTRY *Dentry; }; =20 +#define EXT4_FILE_FROM_THIS(This) BASE_CR ((This), EXT4_FILE, Protocol) + #define EXT4_FILE_FROM_OPEN_FILES_NODE(Node) = \ BASE_CR(Node, EXT4_FILE, OpenFilesListNode) =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/Fil= e.c index ae9230d6422b..b1744ad56c98 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -562,7 +562,7 @@ Ext4Open ( EXT4_FILE *FoundFile; EXT4_FILE *Source; =20 - Source =3D (EXT4_FILE *)This; + Source =3D EXT4_FILE_FROM_THIS (This); =20 // // Reset SymLoops counter @@ -599,7 +599,7 @@ Ext4Close ( IN EFI_FILE_PROTOCOL *This ) { - return Ext4CloseInternal ((EXT4_FILE *)This); + return Ext4CloseInternal (EXT4_FILE_FROM_THIS (This)); } =20 /** @@ -680,7 +680,7 @@ Ext4ReadFile ( EXT4_PARTITION *Partition; EFI_STATUS Status; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); Partition =3D File->Partition; =20 ASSERT (Ext4FileIsOpenable (File)); @@ -731,7 +731,7 @@ Ext4WriteFile ( { EXT4_FILE *File; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); =20 if (!(File->OpenMode & EFI_FILE_MODE_WRITE)) { return EFI_ACCESS_DENIED; @@ -761,7 +761,7 @@ Ext4GetPosition ( { EXT4_FILE *File; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); =20 if (Ext4FileIsDir (File)) { return EFI_UNSUPPORTED; @@ -794,7 +794,7 @@ Ext4SetPosition ( { EXT4_FILE *File; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); =20 // Only seeks to 0 (so it resets the ReadDir operation) are allowed if (Ext4FileIsDir (File) && (Position !=3D 0)) { @@ -1062,7 +1062,7 @@ Ext4GetInfo ( EXT4_FILE *File; EXT4_PARTITION *Partition; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); Partition =3D File->Partition; =20 if (CompareGuid (InformationType, &gEfiFileInfoGuid)) { @@ -1179,7 +1179,7 @@ Ext4SetInfo ( EXT4_FILE *File; EXT4_PARTITION *Partition; =20 - File =3D (EXT4_FILE *)This; + File =3D EXT4_FILE_FROM_THIS (This); Partition =3D File->Partition; =20 if (Partition->ReadOnly) { --=20 2.37.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91943): https://edk2.groups.io/g/devel/message/91943 Mute This Topic: https://groups.io/mt/92672601/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-