From: Jonathan McDowell <noodles@fb.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
"linux-integrity@vger.kernel.org"
<linux-integrity@vger.kernel.org>,
"linux-security-module@vger.kernel.org"
<linux-security-module@vger.kernel.org>,
"kexec@lists.infradead.org" <kexec@lists.infradead.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
Mimi Zohar <zohar@linux.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Dmitrii Potoskuev <dpotoskuev@fb.com>
Subject: [RFC PATCH 5/7] lib/cpio: Add a parse-only option that doesn't extract any files
Date: Fri, 8 Jul 2022 10:12:22 +0000 [thread overview]
Message-ID: <b5f14649db9615bb9cbfc66863547aa96f7e7786.1657272362.git.noodles@fb.com> (raw)
In-Reply-To: <cover.1657272362.git.noodles@fb.com>
In order to allow a CPIO archive to be parsed without actually
extracting anything add a parse_only flag.
Signed-off-by: Jonathan McDowell <noodles@fb.com>
---
include/linux/cpio.h | 2 ++
lib/cpio.c | 35 ++++++++++++++++++++++++++++-------
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/include/linux/cpio.h b/include/linux/cpio.h
index b05140a565cb..86a43270d186 100644
--- a/include/linux/cpio.h
+++ b/include/linux/cpio.h
@@ -77,6 +77,8 @@ struct cpio_context {
struct cpio_link_hash *link_hash[CPIO_LINK_HASH_SIZE];
struct list_head dir_list;
+
+ bool parse_only;
};
int __cpio cpio_start(struct cpio_context *ctx);
diff --git a/lib/cpio.c b/lib/cpio.c
index 16629ad1e339..36357806eb70 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -15,7 +15,12 @@ static ssize_t __cpio xwrite(struct cpio_context *ctx, struct file *file,
/* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
while (count) {
- ssize_t rv = kernel_write(file, p, count, pos);
+ ssize_t rv;
+
+ if (ctx->parse_only)
+ rv = count;
+ else
+ rv = kernel_write(file, p, count, pos);
if (rv < 0) {
if (rv == -EINTR || rv == -EAGAIN)
@@ -136,7 +141,8 @@ static void __cpio dir_utime(struct cpio_context *ctx)
list_for_each_entry_safe(de, tmp, &ctx->dir_list, list) {
list_del(&de->list);
- do_utime(de->name, de->mtime);
+ if (!ctx->parse_only)
+ do_utime(de->name, de->mtime);
kfree(de);
}
}
@@ -374,6 +380,13 @@ static int __cpio do_name(struct cpio_context *ctx)
free_hash(ctx);
return 0;
}
+
+ if (ctx->parse_only) {
+ if (S_ISREG(ctx->mode))
+ ctx->state = CPIO_COPYFILE;
+ return 0;
+ }
+
clean_path(ctx->collected, ctx->mode);
if (S_ISREG(ctx->mode)) {
int ml = maybe_link(ctx);
@@ -452,8 +465,10 @@ static int __cpio do_copy(struct cpio_context *ctx)
if (ret != ctx->body_len)
return (ret < 0) ? ret : -EIO;
- do_utime_path(&ctx->wfile->f_path, ctx->mtime);
- fput(ctx->wfile);
+ if (!ctx->parse_only) {
+ do_utime_path(&ctx->wfile->f_path, ctx->mtime);
+ fput(ctx->wfile);
+ }
if (ctx->csum_present && ctx->io_csum != ctx->hdr_csum)
return -EBADMSG;
@@ -478,6 +493,12 @@ static int __cpio do_symlink(struct cpio_context *ctx)
struct path path;
int error;
+ ctx->state = CPIO_SKIPIT;
+ ctx->next_state = CPIO_RESET;
+
+ if (ctx->parse_only)
+ return 0;
+
ctx->collected[N_ALIGN(ctx->name_len) + ctx->body_len] = '\0';
clean_path(ctx->collected, 0);
@@ -496,8 +517,7 @@ static int __cpio do_symlink(struct cpio_context *ctx)
cpio_chown(ctx->collected, ctx->uid, ctx->gid, AT_SYMLINK_NOFOLLOW);
do_utime(ctx->collected, ctx->mtime);
- ctx->state = CPIO_SKIPIT;
- ctx->next_state = CPIO_RESET;
+
return 0;
}
@@ -579,7 +599,8 @@ int __cpio cpio_start(struct cpio_context *ctx)
void __cpio cpio_finish(struct cpio_context *ctx)
{
- dir_utime(ctx);
+ if (!ctx->parse_only)
+ dir_utime(ctx);
kfree(ctx->name_buf);
kfree(ctx->symlink_buf);
kfree(ctx->header_buf);
--
2.36.1
next prev parent reply other threads:[~2022-07-08 10:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 10:10 [RFC PATCH 0/7] ima: Support measurement of kexec initramfs components Jonathan McDowell
2022-07-08 10:11 ` [RFC PATCH 1/7] initramfs: Move cpio handling routines into lib/ Jonathan McDowell
2022-07-08 10:11 ` [RFC PATCH 2/7] lib/cpio: Improve error handling Jonathan McDowell
2022-07-08 10:12 ` [RFC PATCH 3/7] lib/cpio: use non __init filesystem related functions Jonathan McDowell
2022-07-11 8:38 ` [lib/cpio] 0e4846b4e7: Initramfs_unpacking_failed kernel test robot
2022-07-08 10:12 ` [RFC PATCH 4/7] lib/cpio: Allow use outside of initramfs creation Jonathan McDowell
2022-07-08 10:12 ` Jonathan McDowell [this message]
2022-07-08 10:12 ` [RFC PATCH 6/7] HACK: Allow the use of generic decompress with gzip outside __init Jonathan McDowell
2022-07-08 10:12 ` [RFC PATCH 7/7] ima: Support measurement of kexec initramfs components Jonathan McDowell
2022-07-08 11:49 ` [RFC PATCH 0/7] " Mimi Zohar
2022-07-08 15:34 ` Jonathan McDowell
2022-07-28 14:08 ` [RFC PATCH v2 " Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 1/7] initramfs: Move cpio handling routines into lib/ Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 2/7] lib/cpio: Improve error handling Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 3/7] lib/cpio: use non __init filesystem related functions Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 4/7] lib/cpio: Allow use outside of initramfs creation Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 5/7] lib/cpio: Add a parse-only option that doesn't extract any files Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 6/7] HACK: Allow the use of generic decompress with gzip outside __init Jonathan McDowell
2022-07-28 14:09 ` [RFC PATCH v2 7/7] ima: Support measurement of kexec initramfs components Jonathan McDowell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b5f14649db9615bb9cbfc66863547aa96f7e7786.1657272362.git.noodles@fb.com \
--to=noodles@fb.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=dpotoskuev@fb.com \
--cc=jmorris@namei.org \
--cc=kexec@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=serge@hallyn.com \
--cc=viro@zeniv.linux.org.uk \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®