From nobody Mon Feb 9 01:16:16 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+99146+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+99146+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1674811798; cv=none; d=zohomail.com; s=zohoarc; b=ENmdOX7EaD7fd/YqErgR1MS6QP5HSw++rG/yeSRDj2z5FGmrOqjh5pFb8lQn6W5PMGC407Etij+DqtvC7V3Y4yprfJlnVsPG7nC69NHylJULZ20U1VinfvQtqeWbhaV6tXDyZH77OioLxal0pSGMEENyqXTpW4OciJtGIrwR3H0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811798; 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=fEd7nA764YB6aEXm1AfqB1snZG2WhoxyFzxU+KQZlQo=; b=TyOdZkQc+qi48ppuxNgVjux3h9aH78aeX9Ez0glaAJj0uCBXynrclSl/21/9Xgewchyyq/mD/k+O6sIpu8DGSb6CW0LMNaVZ06QEMJMb5OG4si2Kl9SL7uKd21SVdNRECd8KaNTja+77/hvmhnmaBK3p5gCq3km9YjLRUE8dx1o= 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+99146+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 1674811798398760.0599007505668; Fri, 27 Jan 2023 01:29:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id SMU9YY1788612xIhu1KBDZVO; Fri, 27 Jan 2023 01:29:58 -0800 X-Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by mx.groups.io with SMTP id smtpd.web11.98570.1674811791892615145 for ; Fri, 27 Jan 2023 01:29:57 -0800 X-Received: by mail-lf1-f51.google.com with SMTP id o20so7236637lfk.5 for ; Fri, 27 Jan 2023 01:29:56 -0800 (PST) X-Gm-Message-State: JmIFeaUQgIYgT3cH6twVcwhhx1787277AA= X-Google-Smtp-Source: AMrXdXtSIZ7PXKTrZkL+meJFHud42DJNIpODDrB2FdLJjDeBy073YrXmWfqQJ31DrYGT3rzyNgzHmg== X-Received: by 2002:ac2:5299:0:b0:4d2:bb83:e7e6 with SMTP id q25-20020ac25299000000b004d2bb83e7e6mr9224708lfm.59.1674811796419; Fri, 27 Jan 2023 01:29:56 -0800 (PST) X-Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id t11-20020a056512068b00b004cc8196a308sm229071lfe.98.2023.01.27.01.29.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Jan 2023 01:29:56 -0800 (PST) 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 v3 10/11] Ext4Pkg: Fixes build on MSVC Date: Fri, 27 Jan 2023 15:29:44 +0600 Message-Id: <20230127092945.94389-11-savvamtr@gmail.com> In-Reply-To: <20230127092945.94389-1-savvamtr@gmail.com> References: <20230127092945.94389-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=1674811798; bh=P6C7x79RnvJBJRFmoYdNbWnPrP4m7bogcO72f1ESX80=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Q6n3MvDaC1aerDRCT0oiDXUk8fVB/6N8AMwSa40zKTaUkg+5AtUQHngEX6a5OxheuNz 1kRnbrsEPH5oih6DJgRPbbq8u5ovcxRc2hUHmwOuAbPK0rUNvqwAXEyTd+HYoOnZ3A+wx ZuB4TN7xo7lX5M12bZCsBEeMIb8fOLiBy7w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1674811798666100033 Content-Type: text/plain; charset="utf-8" Accessing array using index of uint64 type makes MSVC compiler to include `__allmul` function in NOOPT which is not referenced in IA32. So we null-terminates string using ReadSize, which should be equal to SymlinkSizeTmp after correct reading. Also adds missing MultU64x32 in Ext4Read. Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: 7c46116b0e18 ("Ext4Pkg: Add ext2/3 support") Fixes: e81432fbacb7 ("Ext4Pkg: Add symbolic links support") Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/Inode.c | 4 ++-- Features/Ext4Pkg/Ext4Dxe/Symlink.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Inode.c b/Features/Ext4Pkg/Ext4Dxe/In= ode.c index 90e3eb88f523..8db051d3c444 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Inode.c +++ b/Features/Ext4Pkg/Ext4Dxe/Inode.c @@ -152,7 +152,7 @@ Ext4Read ( } else { // Uninitialized extents behave exactly the same as file holes, ex= cept they have // blocks already allocated to them. - HoleLen =3D (Ext4GetExtentLength (&Extent) * Partition->BlockSize)= - HoleOff; + HoleLen =3D MultU64x32 (Ext4GetExtentLength (&Extent), Partition->= BlockSize) - HoleOff; } =20 WasRead =3D HoleLen > RemainingRead ? RemainingRead : (UINTN)HoleLen; @@ -166,7 +166,7 @@ Ext4Read ( Partition->BlockSize ); ExtentLengthBytes =3D Extent.ee_len * Partition->BlockSize; - ExtentLogicalBytes =3D (UINT64)Extent.ee_block * Partition->BlockSiz= e; + ExtentLogicalBytes =3D MultU64x32 ((UINT64)Extent.ee_block, Partitio= n->BlockSize); ExtentOffset =3D CurrentSeek - ExtentLogicalBytes; ExtentMayRead =3D (UINTN)(ExtentLengthBytes - ExtentOffset); =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/Symlink.c b/Features/Ext4Pkg/Ext4Dxe/= Symlink.c index 19b357ac6ba0..8b1511a38b55 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Symlink.c +++ b/Features/Ext4Pkg/Ext4Dxe/Symlink.c @@ -1,7 +1,7 @@ /** @file Symbolic links routines =20 - Copyright (c) 2022 Savva Mitrofanov All rights reserved. + Copyright (c) 2022-2023 Savva Mitrofanov All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 @@ -155,11 +155,6 @@ Ext4ReadSlowSymlink ( return Status; } =20 - // - // Add null-terminator - // - SymlinkTmp[SymlinkSizeTmp] =3D '\0'; - if (SymlinkSizeTmp !=3D ReadSize) { DEBUG (( DEBUG_FS, @@ -168,6 +163,11 @@ Ext4ReadSlowSymlink ( return EFI_VOLUME_CORRUPTED; } =20 + // + // Add null-terminator + // + SymlinkTmp[ReadSize] =3D '\0'; + *AsciiSymlinkSize =3D SymlinkAllocateSize; *AsciiSymlink =3D SymlinkTmp; =20 --=20 2.39.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 (#99146): https://edk2.groups.io/g/devel/message/99146 Mute This Topic: https://groups.io/mt/96562700/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-