| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250422123612.261764-4-lihongbo22@huawei.com>
Date: Tue, 22 Apr 2025 12:36:11 +0000
From: Hongbo Li <lihongbo22@...wei.com>
To: <xiang@...nel.org>, <chao@...nel.org>, <huyue2@...lpad.com>,
<jefflexu@...ux.alibaba.com>
CC: <linux-erofs@...ts.ozlabs.org>, <linux-kernel@...r.kernel.org>,
<lihongbo22@...wei.com>
Subject: [PATCH RFC 3/4] erofs-utils: lib: add --meta_only format option
This option is used to drop the data part based on --meta_fix.
It allows the user can only get the metadata part of the erofs
images.
Signed-off-by: Hongbo Li <lihongbo22@...wei.com>
---
include/erofs/blobraw.h | 3 ++-
include/erofs/config.h | 1 +
lib/blobraw.c | 42 ++++++++++++++++++++++++-----------------
lib/inode.c | 2 +-
mkfs/main.c | 12 ++++++++++++
5 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/include/erofs/blobraw.h b/include/erofs/blobraw.h
index d56bb46..68df6b8 100755
--- a/include/erofs/blobraw.h
+++ b/include/erofs/blobraw.h
@@ -14,8 +14,9 @@ extern "C"
#include "erofs/internal.h"
+erofs_blk_t erofs_blobraw_total(struct erofs_sb_info *sbi);
void erofs_blobraw_remap_blkaddr(struct erofs_inode *inode);
-int erofs_blobraw_write_file(struct erofs_inode *inode, int fd);
+int erofs_blobraw_write_file(struct erofs_inode *inode, int fd, bool drop_blob);
int erofs_blobraw_init();
void erofs_blobraw_exit();
int erofs_mkfs_dump_rawblob(struct erofs_sb_info *sbi, bool drop_blob);
diff --git a/include/erofs/config.h b/include/erofs/config.h
index ac6dd9b..491b3aa 100644
--- a/include/erofs/config.h
+++ b/include/erofs/config.h
@@ -67,6 +67,7 @@ struct erofs_configure {
bool c_ovlfs_strip;
bool c_hard_dereference;
bool c_meta_fix;
+ bool c_meta_only;
#ifdef HAVE_LIBSELINUX
struct selabel_handle *sehnd;
diff --git a/lib/blobraw.c b/lib/blobraw.c
index 248fc30..9113a49 100755
--- a/lib/blobraw.c
+++ b/lib/blobraw.c
@@ -17,13 +17,19 @@ static int blobfile = -1; /* tmp fd for blob buffer */
static erofs_blk_t remapped_base; /* metadata block end address */
static erofs_off_t bloboff; /* current blob file offset */
+erofs_blk_t erofs_blobraw_total(struct erofs_sb_info *sbi)
+{
+ return erofs_blknr(sbi, bloboff);
+}
+
void erofs_blobraw_remap_blkaddr(struct erofs_inode *inode)
{
if (inode->i_size > 0)
inode->u.i_blkaddr += remapped_base;
}
-int erofs_blobraw_write_file(struct erofs_inode *inode, int fd)
+int erofs_blobraw_write_file(struct erofs_inode *inode,
+ int fd, bool drop_blob)
{
static u8 zeroed[EROFS_MAX_BLOCK_SIZE];
struct erofs_sb_info *sbi = inode->sbi;
@@ -32,22 +38,24 @@ int erofs_blobraw_write_file(struct erofs_inode *inode, int fd)
ssize_t length, ret, isize = inode->i_size;
u64 pos_in, pos_out = bloboff;
- pos_in = 0;
- do {
- length = min_t(erofs_off_t, isize, SSIZE_MAX);
- ret = erofs_copy_file_range(fd, &pos_in,
- blobfile, &pos_out, length);
- } while (ret > 0 && (isize -= ret));
-
- foff = lseek(blobfile, inode->i_size, SEEK_CUR);
- DBG_BUGON(foff != bloboff + inode->i_size);
-
- padding = erofs_blkoff(sbi, inode->i_size);
- if (padding) {
- padding = erofs_blksiz(sbi) - padding;
- ret = __erofs_io_write(blobfile, zeroed, padding);
- if (ret > 0 && ret != padding)
- return -EIO;
+ if (!drop_blob) {
+ pos_in = 0;
+ do {
+ length = min_t(erofs_off_t, isize, SSIZE_MAX);
+ ret = erofs_copy_file_range(fd, &pos_in,
+ blobfile, &pos_out, length);
+ } while (ret > 0 && (isize -= ret));
+
+ foff = lseek(blobfile, inode->i_size, SEEK_CUR);
+ DBG_BUGON(foff != bloboff + inode->i_size);
+
+ padding = erofs_blkoff(sbi, inode->i_size);
+ if (padding) {
+ padding = erofs_blksiz(sbi) - padding;
+ ret = __erofs_io_write(blobfile, zeroed, padding);
+ if (ret > 0 && ret != padding)
+ return -EIO;
+ }
}
inode->datalayout = EROFS_INODE_FLAT_PLAIN;
diff --git a/lib/inode.c b/lib/inode.c
index 39257c7..6eb275b 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -581,7 +581,7 @@ int erofs_write_unencoded_file(struct erofs_inode *inode, int fd, u64 fpos)
}
if (cfg.c_meta_fix)
- return erofs_blobraw_write_file(inode, fd);
+ return erofs_blobraw_write_file(inode, fd, cfg.c_meta_only);
/* fallback to all data uncompressed */
return write_uncompressed_file_from_fd(inode, fd);
}
diff --git a/mkfs/main.c b/mkfs/main.c
index 82db452..be3ee7f 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -89,6 +89,7 @@ static struct option long_options[] = {
{"hard-dereference", no_argument, NULL, 528},
{"dsunit", required_argument, NULL, 529},
{"meta_fix", no_argument, NULL, 530},
+ {"meta_only", no_argument, NULL, 531},
{0, 0, 0, 0},
};
@@ -194,6 +195,7 @@ static void usage(int argc, char **argv)
" --ovlfs-strip=<0,1> strip overlayfs metadata in the target image (e.g. whiteouts)\n"
" --quiet quiet execution (do not write anything to standard output.)\n"
" --meta_fix make metadata area fixed at the front of the image file\n"
+ " --meta_only only keep the metadata area in image file\n"
#ifndef NDEBUG
" --random-pclusterblks randomize pclusterblks for big pcluster (debugging only)\n"
" --random-algorithms randomize per-file algorithms (debugging only)\n"
@@ -892,6 +894,9 @@ static int mkfs_parse_options_cfg(int argc, char *argv[])
case 530:
cfg.c_meta_fix = true;
break;
+ case 531:
+ cfg.c_meta_only = true;
+ break;
case 'V':
version();
exit(0);
@@ -909,6 +914,11 @@ static int mkfs_parse_options_cfg(int argc, char *argv[])
return -EINVAL;
}
+ if (cfg.c_meta_only && !cfg.c_meta_fix) {
+ erofs_err("--meta_only must be used together with --meta_fix");
+ return -EINVAL;
+ }
+
if (cfg.c_meta_fix) {
if (cfg.c_compr_opts[0].alg) {
erofs_err("--meta_fix cannot be used with compress case");
@@ -1529,6 +1539,8 @@ int main(int argc, char **argv)
if (err)
goto exit;
+ if (cfg.c_meta_only)
+ nblocks -= erofs_blobraw_total(&g_sbi);
err = erofs_dev_resize(&g_sbi, nblocks);
if (!err && erofs_sb_has_sb_chksum(&g_sbi)) {
--
2.22.0
Powered by blists - more mailing lists