From nobody Tue Feb 10 10:04:20 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+99456+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+99456+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675333310; cv=none; d=zohomail.com; s=zohoarc; b=lewiwxBY0GeMZZFcQN+1I8iZOrfsfJHeSxTKTwXsy5P8eOhDdnppb5iIu3T4jhyTVe20oI5m5OelzEwXrXe8veMgeNu4AxED6FtKMVbD5sGjr6S4H+4tp5isgIqBhuXE2DYDMz20he7qkam9JG2dcgJNm9qy/PUbdpsNIB6NBfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675333310; 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=Vv5b0HGyzDc+/Upz7L2tbJza4TwljgDkkpv+VeA0Vk8=; b=guU+gizy2HLyiHAULUyYuaFOg38p6KCFoVk8tZmg3sDZkLmbTIubn2Ak3lsxTDWkw8bVlrECZRTa9z6fbXTyk26k6YDv25npv9e0/wpGpYZkmjYfYw29GqifHDUNJzVR6T427KEEj+sKq21nC81aJarYjEDr37/uKfEIhrzMaTM= 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+99456+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 16753333104801006.9270229623529; Thu, 2 Feb 2023 02:21:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Q25SYY1788612x8ZsODCjcmz; Thu, 02 Feb 2023 02:21:50 -0800 X-Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web11.11513.1675333309306946478 for ; Thu, 02 Feb 2023 02:21:49 -0800 X-Received: by mail-ej1-f41.google.com with SMTP id k4so4622311eje.1 for ; Thu, 02 Feb 2023 02:21:49 -0800 (PST) X-Gm-Message-State: WIWGYWVAGa9ldRJ4KLNnNAOFx1787277AA= X-Google-Smtp-Source: AK7set+hcJWdCBCesW2wxt9E+xkKUe9kQHFwzc2j9wxUiFwPoDtEhanrC33yuO968MGDfjE3j+9t/Q== X-Received: by 2002:a17:906:684c:b0:877:a2d1:7560 with SMTP id a12-20020a170906684c00b00877a2d17560mr5068276ejs.27.1675333307675; Thu, 02 Feb 2023 02:21:47 -0800 (PST) X-Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id ci22-20020a170906c35600b0087bcda2b07bsm10013121ejb.202.2023.02.02.02.21.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Feb 2023 02:21:47 -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 v4 10/12] Ext4Pkg: Fixes build on MSVC Date: Thu, 2 Feb 2023 16:21:31 +0600 Message-Id: <20230202102133.51606-11-savvamtr@gmail.com> In-Reply-To: <20230202102133.51606-1-savvamtr@gmail.com> References: <20230202102133.51606-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=1675333310; bh=ZqOOYMaD64tmmcZaPwiNXQbRzmVbU505BjHcMUe0O1w=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EZQPyyGz0tLkQzB/nMjS1jFbHsT270rubxdt8OrZ/lmWkytZiKvGPJOwW9PfGbwWpfU r7+IXv7urdyr6ChFLZ/IlnIz2hCwVS51G53QIsDShotXd3tnmCfW190Yk1GYxyt9MXoaT CW9FqOUrQ11xl8Szs2OaUtGGwyBQAzLFs6w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675333311371100005 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 Reviewed-by: Marvin H=C3=A4user --- 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.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 (#99456): https://edk2.groups.io/g/devel/message/99456 Mute This Topic: https://groups.io/mt/96697375/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-