From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.41667.1673481569361860548 for ; Wed, 11 Jan 2023 15:59:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=f4SLYRDh; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: pedro.falcato@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id g19-20020a05600c4ed300b003d9eb1dbc0aso10893886wmq.3 for ; Wed, 11 Jan 2023 15:59:29 -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=YXdDTQvHJuMdurGkusro8rFSKcaYq7gieN6vom13LY0=; b=f4SLYRDhiod5YypGlNvnZD1DkqMGLUy4yZfZWJxviPukF9O7gdVc16trWUO2g9FDVG 3+FNJcIwqQCXYRydcurFHcPca5kvT2qOSB2smoCK/I8WVhsK9kRY+SZn/k4kZed6hARW 8Uh8mgjSf/SLtJ8HtIsspea2b6uQc9by2fbDJc02s0Oy1FgkzauM5k/1q+RnucQWG/Yy JfnvHS8V2oUvtBRT4pCUJf3tnK7KLR1X7IBBeQc7qkn6gz5H9sRGZuMYBKam914kO1SS p2SqgANO492BnLn5SFfNGCWiBV6+AjohQSIOJ0Msnsn7jUAkVb7dVnuddr3YAQQM3yS0 cBug== 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=YXdDTQvHJuMdurGkusro8rFSKcaYq7gieN6vom13LY0=; b=4wnN6JEtwtTvKghsEMjNsQ2NbDrpci30sC6+SJDldubpVwMDijvGDzaY77NNY5JgmT Apxw+IlhMPT9LC6C19OpC5BwUQ/MDDC85d/zcS6XguiJnzP447Je83TU1nrXZ7OoiOH1 6V6PtBzJkmoy6QrwUv+GIgopOwTN7hZdu1kyz+Ncl22VSzzQ5XklbLiEuGAEABZPyfY2 9/PBfblNVDgOwcYNKb2uGmKPup3F+v78BI4fGInzZfmhPuHV2G3DSVcC3NONAQwSoP63 Sf6b1CV7J0dZDuHldVPhp7dMl509dM7vKOC52rkY6PFaPy0pGwLJxOnMAtcGvYA9ag4x bTog== X-Gm-Message-State: AFqh2kole76xA5cq03ZPWUWTpNfRfd2hsdGJo+hLLoNFw2Ilnw3CrsW6 71qJ2jECT6vzfrzr7ank3it3B0K+gQlvVw== X-Google-Smtp-Source: AMrXdXtY8+rhhpHHJk6Sr74OdSQK2Aabdea2qpyfmfgJ3bvKsCFo3R4PRFpxVbiA98CBDn23TRU2+Q== X-Received: by 2002:a05:600c:3ca2:b0:3d9:da3a:ef9b with SMTP id bg34-20020a05600c3ca200b003d9da3aef9bmr16376934wmb.31.1673481567506; Wed, 11 Jan 2023 15:59:27 -0800 (PST) Return-Path: Received: from PC-PEDRO-ARCH.lan ([2001:8a0:7280:5801:9441:3dce:686c:bfc7]) by smtp.gmail.com with ESMTPSA id p21-20020a7bcc95000000b003c65c9a36dfsm19276102wma.48.2023.01.11.15.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 15:59:27 -0800 (PST) From: "Pedro Falcato" To: devel@edk2.groups.io Cc: Pedro Falcato , =?UTF-8?q?Marvin=20H=C3=A4user?= Subject: [PATCH 2/3] Ext4Pkg: Add documentation surrounding ext4 directory entries Date: Wed, 11 Jan 2023 23:59:18 +0000 Message-Id: <20230111235920.252317-4-pedro.falcato@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111235920.252317-1-pedro.falcato@gmail.com> References: <20230111235920.252317-1-pedro.falcato@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several questions have popped up regarding the ext4 directory entry layout and contents off-list. Attempt to clarify these issues by adding some explanatory comments. Signed-off-by: Pedro Falcato Cc: Marvin Häuser --- Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h | 21 +++++++++++++++++++-- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 5 ++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h b/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h index 4fd91a423324..d0a455d0e572 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h @@ -1,7 +1,7 @@ /** @file Raw filesystem data structures - Copyright (c) 2021 Pedro Falcato All rights reserved. + Copyright (c) 2021 - 2023 Pedro Falcato All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent Layout of an EXT2/3/4 filesystem: @@ -397,12 +397,29 @@ typedef struct _Ext4Inode { UINT32 i_projid; } EXT4_INODE; +#define EXT4_NAME_MAX 255 + typedef struct { + // offset 0x0: inode number (if 0, unused entry, should skip.) UINT32 inode; + // offset 0x4: Directory entry's length. + // Note: rec_len >= name_len + EXT4_MIN_DIR_ENTRY_LEN and rec_len % 4 == 0. UINT16 rec_len; + // offset 0x6: Directory entry's name's length UINT8 name_len; + // offset 0x7: Directory entry's file type indicator UINT8 file_type; - CHAR8 name[255]; + // offset 0x8: name[name_len]: Variable length character array; not null-terminated. + CHAR8 name[EXT4_NAME_MAX]; + // Further notes on names: + // 1) We use EXT4_NAME_MAX here instead of flexible arrays for ease of use around the driver. + // + // 2) ext4 directories are defined, as the documentation puts it, as: + // "a directory is more or less a flat file that maps an arbitrary byte string + // (usually ASCII) to an inode number on the filesystem". So, they are not + // necessarily encoded with ASCII, UTF-8, or any of the sort. We must treat it + // as a bag of bytes. When interacting with EFI interfaces themselves (which expect UCS-2) + // we skip any directory entry that is not valid UTF-8. } EXT4_DIR_ENTRY; #define EXT4_MIN_DIR_ENTRY_LEN 8 diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h index adf3c13f6ea9..466e49523030 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -1,7 +1,7 @@ /** @file Common header for the driver - Copyright (c) 2021 - 2022 Pedro Falcato All rights reserved. + Copyright (c) 2021 - 2023 Pedro Falcato All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -31,8 +31,7 @@ #include "Ext4Disk.h" -#define SYMLOOP_MAX 8 -#define EXT4_NAME_MAX 255 +#define SYMLOOP_MAX 8 // // We need to specify path length limit for security purposes, to prevent possible // overflows and dead-loop conditions. Originally this limit is absent in FS design, -- 2.39.0