From: Taras Kondratiuk <takondra@cisco.com> To: "H. Peter Anvin" <hpa@zytor.com>, Al Viro <viro@zeniv.linux.org.uk>, Arnd Bergmann <arnd@arndb.de>, Rob Landley <rob@landley.net>, Mimi Zohar <zohar@linux.vnet.ibm.com>, Jonathan Corbet <corbet@lwn.net>, James McMechan <james.w.mcmechan@gmail.com> Cc: initramfs@vger.kernel.org, Victor Kamensky <kamensky@cisco.com>, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, xe-linux-external@cisco.com Subject: [PATCH v2 06/15] initramfs: separate reading cpio method from header Date: Thu, 25 Jan 2018 03:27:46 +0000 [thread overview] Message-ID: <1516850875-25066-7-git-send-email-takondra@cisco.com> (raw) In-Reply-To: <1516850875-25066-1-git-send-email-takondra@cisco.com> From: Mimi Zohar <zohar@linux.vnet.ibm.com> In preparation for adding xattr support, read the CPIO method separately from the rest of the header. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Taras Kondratiuk <takondra@cisco.com> --- init/initramfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 2d5920c094e0..b3d39c8793be 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -168,7 +168,7 @@ static void __init parse_header(char *s) int i; buf[8] = '\0'; - for (i = 0, s += 6; i < 12; i++, s += 8) { + for (i = 0; i < 12; i++, s += 8) { memcpy(buf, s, 8); parsed[i] = simple_strtoul(buf, NULL, 16); } @@ -189,6 +189,7 @@ static void __init parse_header(char *s) static int __init do_start(void); static int __init do_collect(void); +static int __init do_format(void); static int __init do_header(void); static int __init do_skip(void); static int __init do_name(void); @@ -233,7 +234,7 @@ static __initdata char *header_buf, *symlink_buf, *name_buf; static int __init do_start(void) { - read_into(header_buf, 110, do_header); + read_into(header_buf, 6, do_format); return 0; } @@ -251,7 +252,7 @@ static int __init do_collect(void) return 0; } -static int __init do_header(void) +static int __init do_format(void) { if (memcmp(collected, "070707", 6)==0) { error("incorrect cpio method used: use -H newc option"); @@ -261,6 +262,12 @@ static int __init do_header(void) error("no cpio magic"); return 1; } + read_into(header_buf, 104, do_header); + return 0; +} + +static int __init do_header(void) +{ parse_header(collected); next_header = this_header + N_ALIGN(name_len) + body_len; next_header = (next_header + 3) & ~3; @@ -457,7 +464,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) const char *compress_name; static __initdata char msg_buf[64]; - header_buf = kmalloc(110, GFP_KERNEL); + header_buf = kmalloc(104, GFP_KERNEL); symlink_buf = kmalloc(PATH_MAX + 1, GFP_KERNEL); name_buf = kmalloc(N_ALIGN(PATH_MAX), GFP_KERNEL); -- 2.10.3.dirty
WARNING: multiple messages have this Message-ID (diff)
From: takondra@cisco.com (Taras Kondratiuk) To: linux-security-module@vger.kernel.org Subject: [PATCH v2 06/15] initramfs: separate reading cpio method from header Date: Thu, 25 Jan 2018 03:27:46 +0000 [thread overview] Message-ID: <1516850875-25066-7-git-send-email-takondra@cisco.com> (raw) In-Reply-To: <1516850875-25066-1-git-send-email-takondra@cisco.com> From: Mimi Zohar <zohar@linux.vnet.ibm.com> In preparation for adding xattr support, read the CPIO method separately from the rest of the header. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Taras Kondratiuk <takondra@cisco.com> --- init/initramfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 2d5920c094e0..b3d39c8793be 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -168,7 +168,7 @@ static void __init parse_header(char *s) int i; buf[8] = '\0'; - for (i = 0, s += 6; i < 12; i++, s += 8) { + for (i = 0; i < 12; i++, s += 8) { memcpy(buf, s, 8); parsed[i] = simple_strtoul(buf, NULL, 16); } @@ -189,6 +189,7 @@ static void __init parse_header(char *s) static int __init do_start(void); static int __init do_collect(void); +static int __init do_format(void); static int __init do_header(void); static int __init do_skip(void); static int __init do_name(void); @@ -233,7 +234,7 @@ static __initdata char *header_buf, *symlink_buf, *name_buf; static int __init do_start(void) { - read_into(header_buf, 110, do_header); + read_into(header_buf, 6, do_format); return 0; } @@ -251,7 +252,7 @@ static int __init do_collect(void) return 0; } -static int __init do_header(void) +static int __init do_format(void) { if (memcmp(collected, "070707", 6)==0) { error("incorrect cpio method used: use -H newc option"); @@ -261,6 +262,12 @@ static int __init do_header(void) error("no cpio magic"); return 1; } + read_into(header_buf, 104, do_header); + return 0; +} + +static int __init do_header(void) +{ parse_header(collected); next_header = this_header + N_ALIGN(name_len) + body_len; next_header = (next_header + 3) & ~3; @@ -457,7 +464,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) const char *compress_name; static __initdata char msg_buf[64]; - header_buf = kmalloc(110, GFP_KERNEL); + header_buf = kmalloc(104, GFP_KERNEL); symlink_buf = kmalloc(PATH_MAX + 1, GFP_KERNEL); name_buf = kmalloc(N_ALIGN(PATH_MAX), GFP_KERNEL); -- 2.10.3.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info@ http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-01-25 3:39 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-25 3:27 [PATCH v2 00/15] extend initramfs archive format to support xattrs Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 01/15] Documentation: add newcx initramfs format description Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 9:29 ` Arnd Bergmann 2018-01-25 9:29 ` Arnd Bergmann 2018-01-25 20:26 ` Taras Kondratiuk 2018-01-25 20:26 ` Taras Kondratiuk 2018-01-25 20:26 ` Taras Kondratiuk 2018-01-25 21:02 ` Arnd Bergmann 2018-01-25 21:02 ` Arnd Bergmann 2018-01-25 22:13 ` Taras Kondratiuk 2018-01-25 22:13 ` Taras Kondratiuk 2018-01-26 2:39 ` Rob Landley 2018-01-26 2:39 ` Rob Landley 2018-01-26 9:04 ` Arnd Bergmann 2018-01-26 9:04 ` Arnd Bergmann 2018-01-26 10:31 ` Henrique de Moraes Holschuh 2018-01-26 10:31 ` Henrique de Moraes Holschuh 2018-01-26 15:51 ` Victor Kamensky 2018-01-26 15:51 ` Victor Kamensky 2018-01-26 18:15 ` Henrique de Moraes Holschuh 2018-01-26 18:15 ` Henrique de Moraes Holschuh 2018-01-26 18:15 ` Henrique de Moraes Holschuh 2018-01-26 2:40 ` Rob Landley 2018-01-26 2:40 ` Rob Landley 2018-01-26 21:02 ` Taras Kondratiuk 2018-01-26 21:02 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 02/15] initramfs: replace states with function pointers Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 03/15] initramfs: store file name in name_buf Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 04/15] initramfs: remove unnecessary symlinks processing shortcut Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 05/15] initramfs: move files creation into separate state Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk [this message] 2018-01-25 3:27 ` [PATCH v2 06/15] initramfs: separate reading cpio method from header Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 07/15] initramfs: split header layout information from parsing function Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 08/15] initramfs: add newcx format Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 09/15] initramfs: set extended attributes Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 10/15] gen_init_cpio: move header formatting into function Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 11/15] gen_init_cpio: add newcx format Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-26 2:40 ` Rob Landley 2018-01-26 2:40 ` Rob Landley 2018-01-26 20:37 ` Taras Kondratiuk 2018-01-26 20:37 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 12/15] gen_init_cpio: set extended attributes for " Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 13/15] gen_initramfs_list.sh: add -x option to enable " Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 3:27 ` [PATCH v2 14/15] selinux: allow setxattr on rootfs so initramfs code can set them Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 13:51 ` [Fwd: [PATCH v2 14/15] selinux: allow setxattr on rootfs so initramfs code can set them] Stephen Smalley 2018-01-25 3:27 ` [PATCH v2 15/15] selinux: delay sid population for rootfs till init is complete Taras Kondratiuk 2018-01-25 3:27 ` Taras Kondratiuk 2018-01-25 13:48 ` [Fwd: [PATCH v2 15/15] selinux: delay sid population for rootfs till init is complete] Stephen Smalley
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=1516850875-25066-7-git-send-email-takondra@cisco.com \ --to=takondra@cisco.com \ --cc=arnd@arndb.de \ --cc=corbet@lwn.net \ --cc=hpa@zytor.com \ --cc=initramfs@vger.kernel.org \ --cc=james.w.mcmechan@gmail.com \ --cc=kamensky@cisco.com \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=rob@landley.net \ --cc=viro@zeniv.linux.org.uk \ --cc=xe-linux-external@cisco.com \ --cc=zohar@linux.vnet.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.