From nobody Mon Feb 9 16:51:28 2026 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+79592+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+79592+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629408563; cv=none; d=zohomail.com; s=zohoarc; b=N4GgrNysf5gE3bbOdxRtc2DzXyrdpLBK12FczQoReuoQKwbIZnvcTjIYWAKRh8MGoawORZqa4hkdHxaQNcfF5lAmV5l2N1JdsAFgVxJxWkBTBL9JdmZ+9eI19zWxv1O8ADyl0OovimOJeLmlcqGaU1B3RahWh+WC36ZbTIFtCH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629408563; h=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=d3RLkGvdXIOYIzTnUVVvOdLh5xDMOcdbkGDclhLCq8o=; b=BwrD9efpvl4nCrUkTLZiWl3tC+9pzF6xr5e7of4Afib1aaefl2LZ10ZgaICW7wdXvs8VdynLUqLmE1GtYc0F97oPkXzJ10FaRR7DfYpYGTHPKGPfBt10EUpboxCZCMiCSt2rqtxinWl+nGhKqG2xHmepBqEx0ELy8/0q9A1/b4I= 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+79592+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 162940856384221.55502726018733; Thu, 19 Aug 2021 14:29:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UZ68YY1788612xdQm0tNJmL2; Thu, 19 Aug 2021 14:29:23 -0700 X-Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web08.75960.1629408562623119602 for ; Thu, 19 Aug 2021 14:29:22 -0700 X-Received: by mail-wr1-f53.google.com with SMTP id q11so11072267wrr.9 for ; Thu, 19 Aug 2021 14:29:22 -0700 (PDT) X-Gm-Message-State: SnJBvtqiqi6disLrwPrHTWR8x1787277AA= X-Google-Smtp-Source: ABdhPJwmJLdeFXgLVLuw4MiojvbDkqKjzVcsa3aPMsiV7eIq+oY9I5Rwm5LWJUE3NOjeu85pQxvEWQ== X-Received: by 2002:a5d:40cb:: with SMTP id b11mr6035225wrq.135.1629408561050; Thu, 19 Aug 2021 14:29:21 -0700 (PDT) X-Received: from PC-PEDRO.lan (bl8-253-151.dsl.telepac.pt. [85.241.253.151]) by smtp.gmail.com with ESMTPSA id p12sm3118387wmq.44.2021.08.19.14.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 14:29:20 -0700 (PDT) From: "Pedro Falcato" To: devel@edk2.groups.io Cc: Pedro Falcato , Leif Lindholm , Michael D Kinney , Bret Barkelew Subject: [edk2-devel] [PATCH 1/3] Ext4Pkg: Fix incorrect usage of Ext4InitExtentsMap. Date: Thu, 19 Aug 2021 22:28:41 +0100 Message-Id: <20210819212843.37454-2-pedro.falcato@gmail.com> In-Reply-To: <20210819212843.37454-1-pedro.falcato@gmail.com> References: <20210819212843.37454-1-pedro.falcato@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,pedro.falcato@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=1629408563; bh=JOPE5j5W3Tb/llfp4r2sclHWQ9fEqc3Cdvvd8ZLXF0k=; h=Cc:Date:From:Reply-To:Subject:To; b=cadlAtq10KIzRNi+Hia5iE6rsW191L+w+rfhJ/GAmrWgo3/ipZ35nUmYg0dDWDn/vqX AyibW3BRqnbiiuAOUwSDMIVF9MJSd+EkGnimUtk8uoBkLY0tZ/YQiWyJCWp7huZIDU46K 9K9A9RWKr4hXkFQz0JuyguFF0QJq3EJ8sTs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629408710686100010 Content-Type: text/plain; charset="utf-8" Fixes bug triggered by ShellPkg code, in usage of EFI_FILE_PROTOCOL's Open(). Cc: Leif Lindholm Cc: Michael D Kinney Cc: Bret Barkelew Signed-off-by: Pedro Falcato --- Features/Ext4Pkg/Ext4Dxe/File.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/Fil= e.c index 0f5fa6f73f..a3eff2b48a 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -207,6 +207,11 @@ Ext4Open ( =20 FileName +=3D Length; =20 + if (StrCmp(PathSegment, L".") =3D=3D 0) { + // Opens of "." are a no-op + continue; + } + DEBUG ((DEBUG_FS, "[ext4] Opening %s\n", PathSegment)); =20 if (!Ext4FileIsDir (Current)) { @@ -512,12 +517,20 @@ Ext4GetFileInfo ( IN EXT4_FILE *File, OUT EFI_FILE_INFO *Info, IN OUT UINTN *BufferSize ) { - UINTN FileNameLen; - UINTN FileNameSize; - UINTN NeededLength; + UINTN FileNameLen; + UINTN FileNameSize; + UINTN NeededLength; + CONST CHAR16 *FileName; + + if (File->InodeNum =3D=3D 2) { + // Root inode gets a filename of "", regardless of how it was opened. + FileName =3D L""; + } else { + FileName =3D File->FileName; + } =20 - FileNameLen =3D StrLen (File->FileName); - FileNameSize =3D StrSize (File->FileName); + FileNameLen =3D StrLen (FileName); + FileNameSize =3D StrSize (FileName); =20 NeededLength =3D SIZE_OF_EFI_FILE_INFO + FileNameSize; =20 @@ -540,7 +553,7 @@ Ext4GetFileInfo ( =20 *BufferSize =3D NeededLength; =20 - return StrCpyS (Info->FileName, FileNameLen + 1, File->FileName); + return StrCpyS (Info->FileName, FileNameLen + 1, FileName); } =20 /** @@ -687,6 +700,7 @@ Ext4DuplicateFile ( { EXT4_PARTITION *Partition; EXT4_FILE *File; + EFI_STATUS Status; =20 Partition =3D Original->Partition; File =3D AllocateZeroPool (sizeof (EXT4_FILE)); @@ -717,7 +731,8 @@ Ext4DuplicateFile ( File->InodeNum =3D Original->InodeNum; File->OpenMode =3D 0; // Will be filled by other code =20 - if (!Ext4InitExtentsMap (File)) { + Status =3D Ext4InitExtentsMap (File); + if (EFI_ERROR (Status)) { FreePool (File->FileName); FreePool (File->Inode); FreePool (File); --=20 2.33.0 -=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 (#79592): https://edk2.groups.io/g/devel/message/79592 Mute This Topic: https://groups.io/mt/85007621/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-