From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pfh9yf1T; spf=pass (domain: gmail.com, ip: 209.85.167.51, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f51.google.com with SMTP id o20so7236637lfk.5 for ; Fri, 27 Jan 2023 01:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2AWC85rvWDWbfkMkAK9azokYsCaUyMpyUJ3aYvFMTRw=; b=pfh9yf1T1LHMMEUc+JFOWbmtPQ0masbvnWV/f08hJvEGASCxOpnyTX0jf3URWJ7SDT 0dmIflQ3jUhNlGNNQZw0RYyiDlzfRolZWvT7NNyPfvGWtLMYjs8071ykAxL4uCZMZ4y/ tOe/GKD7lUO/Asmkq4xNiWKq2bjtTd7hpgRPC6TpTE/oiKBieKVtxabg4d5RU7UHkI9i R20RQgrj9ZD+z9MLxHrYn1iGZ3cCukYjxVYyBl7OnoOTCoIqNQelpTa+DgRCUlNI44Cp gCKnq3PB6RRWv79tSY8qBpTen7wYbCidKIP3U6ZSg+XUZ7errI2kLdliLaRhfHtl0Iks pz9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2AWC85rvWDWbfkMkAK9azokYsCaUyMpyUJ3aYvFMTRw=; b=N08G0YHpBcHPq7tkc8VRrHA3Hpl8hZHry/bw7xs+oGxTLf8sBkrmU9t53ZXfT89cdM D99EiOqxxmQzqd1vmtSUsrVTI1Ix92Mn/e4CqCi70WU45oijgOG/FW4JDrfBwFCZPrbq 7v4KoXanXewfqSbNHoUA9YA9Nj8m6ctCYSgHisLWz0RaVnkJMJqEbGpGg61dODwcyx/E Eh4l/zE3FU/NnGbgxG4OP3G9te555U98vY9cHixwOO4WAU8WaOSX1bDGFJZlAjS03YDf 9iJ7uucEXuhlvGKc7hMcAFj87NOouvwQJc603okUT42pJftFo5YkxJJ2Tge+FoT/Q+sD oQqw== X-Gm-Message-State: AFqh2kpX5N/ka7fTTORykLxepINwbkoTb9qmelvPH5+mQHsDaNgUA/Fd dIhvpDo55hIkrwLJxT1QitKNPHBnsp9aBYkM 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) Return-Path: 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-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> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127092945.94389-1-savvamtr@gmail.com> References: <20230127092945.94389-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 {=0D // Uninitialized extents behave exactly the same as file holes, ex= cept they have=0D // blocks already allocated to them.=0D - HoleLen =3D (Ext4GetExtentLength (&Extent) * Partition->BlockSize)= - HoleOff;=0D + HoleLen =3D MultU64x32 (Ext4GetExtentLength (&Extent), Partition->= BlockSize) - HoleOff;=0D }=0D =0D WasRead =3D HoleLen > RemainingRead ? RemainingRead : (UINTN)HoleLen= ;=0D @@ -166,7 +166,7 @@ Ext4Read ( Partition->BlockSize=0D );=0D ExtentLengthBytes =3D Extent.ee_len * Partition->BlockSize;=0D - ExtentLogicalBytes =3D (UINT64)Extent.ee_block * Partition->BlockSiz= e;=0D + ExtentLogicalBytes =3D MultU64x32 ((UINT64)Extent.ee_block, Partitio= n->BlockSize);=0D ExtentOffset =3D CurrentSeek - ExtentLogicalBytes;=0D ExtentMayRead =3D (UINTN)(ExtentLengthBytes - ExtentOffset);=0D =0D 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=0D Symbolic links routines=0D =0D - Copyright (c) 2022 Savva Mitrofanov All rights reserved.=0D + Copyright (c) 2022-2023 Savva Mitrofanov All rights reserved.=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D **/=0D =0D @@ -155,11 +155,6 @@ Ext4ReadSlowSymlink ( return Status;=0D }=0D =0D - //=0D - // Add null-terminator=0D - //=0D - SymlinkTmp[SymlinkSizeTmp] =3D '\0';=0D -=0D if (SymlinkSizeTmp !=3D ReadSize) {=0D DEBUG ((=0D DEBUG_FS,=0D @@ -168,6 +163,11 @@ Ext4ReadSlowSymlink ( return EFI_VOLUME_CORRUPTED;=0D }=0D =0D + //=0D + // Add null-terminator=0D + //=0D + SymlinkTmp[ReadSize] =3D '\0';=0D +=0D *AsciiSymlinkSize =3D SymlinkAllocateSize;=0D *AsciiSymlink =3D SymlinkTmp;=0D =0D --=20 2.39.0