From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: initramfs <initramfs@vger.kernel.org>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Al Viro <viro@ZenIV.linux.org.uk>,
linux-ima-devel@lists.sourceforge.net,
linux-security-module <linux-security-module@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v1 06/11] gen_init_cpio: define new CPIO format to support xattrs
Date: Tue, 20 Jan 2015 14:12:55 -0500 [thread overview]
Message-ID: <1421781180-24425-7-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1421781180-24425-1-git-send-email-zohar@linux.vnet.ibm.com>
This patch defines a new CPIO method 070703 for including xattrs.
The new format extends the existing NEWC header to include the
buffer size containing the number of xattrs, the xattr(s) name,
data size, and data.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
usr/gen_init_cpio.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index ee35361..0d9c6e8 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -21,7 +21,11 @@
#define str(s) xstr(s)
static char *newcfmt = "%s%08X%08X%08lX%08lX%08X%08lX"
- "%08X%08X%08X%08X%08X%08X%08X";
+ "%08X%08X%08X%08X%08X%08X%15$08X";
+static char *newcxfmt = "%s%08X%08X%08lX%08lX%08X%08lX"
+ "%08X%08X%08X%08X%08X%08X%08X%08X";
+
+static int newcx;
static unsigned int offset;
static unsigned int ino = 721;
@@ -58,7 +62,7 @@ static void push_rest(const char *name)
putchar(0);
offset += name_len;
- tmp_ofs = name_len + 110;
+ tmp_ofs = name_len + (newcx ? 118 : 110);
while (tmp_ofs & 3) {
putchar(0);
offset++;
@@ -69,7 +73,7 @@ static void push_rest(const char *name)
static void push_hdr(const char *s)
{
fputs(s, stdout);
- offset += 110;
+ offset += newcx ? 118 : 110;
}
static void cpio_trailer(void)
@@ -77,8 +81,8 @@ static void cpio_trailer(void)
char s[256];
const char name[] = "TRAILER!!!";
- sprintf(s, newcfmt,
- "070701", /* magic */
+ sprintf(s, newcx ? newcxfmt : newcfmt,
+ newcx ? "070703": "070701",/* magic */
0, /* ino */
0, /* mode */
(long) 0, /* uid */
@@ -91,6 +95,7 @@ static void cpio_trailer(void)
0, /* rmajor */
0, /* rminor */
(unsigned)strlen(name)+1, /* namesize */
+ 0, /* xattrs-size */
0); /* chksum */
push_hdr(s);
push_rest(name);
@@ -108,8 +113,8 @@ static int cpio_mkslink(const char *name, const char *target,
if (name[0] == '/')
name++;
- sprintf(s, newcfmt,
- "070701", /* magic */
+ sprintf(s, newcx ? newcxfmt : newcfmt,
+ newcx ? "070703": "070701",/* magic */
ino++, /* ino */
S_IFLNK | mode, /* mode */
(long) uid, /* uid */
@@ -122,6 +127,7 @@ static int cpio_mkslink(const char *name, const char *target,
0, /* rmajor */
0, /* rminor */
(unsigned)strlen(name) + 1,/* namesize */
+ 0, /* xattrs-size */
0); /* chksum */
push_hdr(s);
push_string(name);
@@ -156,8 +162,8 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
if (name[0] == '/')
name++;
- sprintf(s, newcfmt,
- "070701", /* magic */
+ sprintf(s, newcx ? newcxfmt : newcfmt,
+ newcx ? "070703": "070701",/* magic */
ino++, /* ino */
mode, /* mode */
(long) uid, /* uid */
@@ -170,6 +176,7 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
0, /* rmajor */
0, /* rminor */
(unsigned)strlen(name) + 1,/* namesize */
+ 0, /* xattrs-size */
0); /* chksum */
push_hdr(s);
push_rest(name);
@@ -249,8 +256,8 @@ static int cpio_mknod(const char *name, unsigned int mode,
if (name[0] == '/')
name++;
- sprintf(s, newcfmt,
- "070701", /* magic */
+ sprintf(s, newcx ? newcxfmt : newcfmt,
+ newcx ? "070703": "070701",/* magic */
ino++, /* ino */
mode, /* mode */
(long) uid, /* uid */
@@ -263,6 +270,7 @@ static int cpio_mknod(const char *name, unsigned int mode,
maj, /* rmajor */
min, /* rminor */
(unsigned)strlen(name) + 1,/* namesize */
+ 0, /* xattrs-size */
0); /* chksum */
push_hdr(s);
push_rest(name);
@@ -338,8 +346,8 @@ static int cpio_mkfile(const char *name, const char *location,
if (name[0] == '/')
name++;
namesize = strlen(name) + 1;
- sprintf(s, newcfmt,
- "070701", /* magic */
+ sprintf(s, newcx ? newcxfmt : newcfmt,
+ newcx ? "070703": "070701",/* magic */
ino, /* ino */
mode, /* mode */
(long) uid, /* uid */
@@ -352,6 +360,7 @@ static int cpio_mkfile(const char *name, const char *location,
0, /* rmajor */
0, /* rminor */
namesize, /* namesize */
+ 0, /* xattrs-size */
0); /* chksum */
push_hdr(s);
push_string(name);
--
1.8.1.4
next prev parent reply other threads:[~2015-01-20 19:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 19:12 [PATCH v1 00/11] extend initramfs archive format to support xattrs Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 01/11] initramfs: separate reading cpio method from header Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 02/11] initramfs: replace simple_strtoul() with kstrtoul() Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 03/11] initramfs: add extended attribute support Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 04/11] initramfs: change size of mtime and file length to 64 bits Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 05/11] gen_init_cpio: replace inline format string with common variable Mimi Zohar
2015-01-20 19:12 ` Mimi Zohar [this message]
2015-01-20 19:12 ` [PATCH v1 07/11] gen_init_cpio: include the file extended attributes Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 08/11] gen_init_cpio: change size of mtime and file length to 64 bits Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 09/11] gen_initramfs_list.sh: include xattrs Mimi Zohar
2015-01-20 19:12 ` [PATCH v1 10/11] evm: make rootfs a special case Mimi Zohar
2015-01-20 19:13 ` [PATCH v1 11/11] ima: include rootfs (tmpfs) in ima_appraise_tcb policy Mimi Zohar
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=1421781180-24425-7-git-send-email-zohar@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=initramfs@vger.kernel.org \
--cc=linux-ima-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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