From: David Disseldorp <ddiss@suse.de>
To: linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org
Cc: Matthew Wilcox <willy@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>,
David Disseldorp <ddiss@suse.de>
Subject: [PATCH RESEND 2/3] initramfs: print helpful cpio error on "crc" magic
Date: Wed, 21 Jul 2021 13:51:52 +0200 [thread overview]
Message-ID: <20210721115153.28620-2-ddiss@suse.de> (raw)
In-Reply-To: <20210721115153.28620-1-ddiss@suse.de>
Contrary to the buffer-format.rst documentation, initramfs cpio
extraction does not support "crc" archives, which carry "070702"
header magic. Make it a little clearer that "newc" (magic="070701") is
the only supported cpio format, by extending the POSIX.1 ASCII
(magic="070707") specific error message to also cover "crc" magic.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
init/initramfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/initramfs.c b/init/initramfs.c
index f01590cefa2d..19b1c70446fc 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -257,7 +257,7 @@ static int __init do_collect(void)
static int __init do_header(void)
{
if (memcmp(collected, "070701", 6)) {
- if (memcmp(collected, "070707", 6) == 0)
+ if (memcmp(collected, "0707", 4) == 0)
error("incorrect cpio method used: use -H newc option");
else
error("no cpio magic");
--
2.26.2
next prev parent reply other threads:[~2021-07-21 12:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 11:51 [PATCH RESEND 1/3] initramfs: move unnecessary memcmp from hot path David Disseldorp
2021-07-21 11:51 ` David Disseldorp [this message]
2021-07-21 11:51 ` [PATCH v2 3/3] docs: remove mention of "crc" cpio format support David Disseldorp
2021-08-04 9:31 ` [PATCH RESEND 1/3] initramfs: move unnecessary memcmp from hot path David Disseldorp
2021-08-04 12:57 ` Al Viro
2021-08-04 13:37 ` David Disseldorp
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=20210721115153.28620-2-ddiss@suse.de \
--to=ddiss@suse.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).