From patchwork Thu Jan 25 03:27:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 10183551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D2FD160383 for ; Thu, 25 Jan 2018 03:38:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C46162887F for ; Thu, 25 Jan 2018 03:38:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8E1028881; Thu, 25 Jan 2018 03:38:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E8A32887F for ; Thu, 25 Jan 2018 03:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933593AbeAYDhq (ORCPT ); Wed, 24 Jan 2018 22:37:46 -0500 Received: from alln-iport-5.cisco.com ([173.37.142.92]:56485 "EHLO alln-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933519AbeAYDhm (ORCPT ); Wed, 24 Jan 2018 22:37:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=3931; q=dns/txt; s=iport; t=1516851461; x=1518061061; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=u+De81/fDjtv0+iiYW8uJIVjAHF8Gax2ObiE6ovdTVk=; b=WqqN+p+p8Exmz4UfsTygGjY/CEFhBg+pTIsEjiq2yTEkbTy23X6/0f/z Gi8K1H5e+Zw+Pz7p00bWIgQZrSZCP18kmTe3hl04VDrc6kzaXFhyPXBuq G9iZi/7bw/mlwUGYkbAXoi3+MMp8Ty1tL26Lk0swtQ9LY6Dxlud4A6+43 I=; X-IronPort-AV: E=Sophos;i="5.46,409,1511827200"; d="scan'208";a="60755436" Received: from rcdn-core-6.cisco.com ([173.37.93.157]) by alln-iport-5.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 03:28:07 +0000 Received: from sjc-ads-7132.cisco.com (sjc-ads-7132.cisco.com [10.30.217.207]) (authenticated bits=0) by rcdn-core-6.cisco.com (8.14.5/8.14.5) with ESMTP id w0P3Ruj2007601 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NO); Thu, 25 Jan 2018 03:28:06 GMT From: Taras Kondratiuk To: "H. Peter Anvin" , Al Viro , Arnd Bergmann , Rob Landley , Mimi Zohar , Jonathan Corbet , James McMechan Cc: initramfs@vger.kernel.org, Victor Kamensky , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, xe-linux-external@cisco.com Subject: [PATCH v2 11/15] gen_init_cpio: add newcx format Date: Thu, 25 Jan 2018 03:27:51 +0000 Message-Id: <1516850875-25066-12-git-send-email-takondra@cisco.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516850875-25066-1-git-send-email-takondra@cisco.com> References: <1516850875-25066-1-git-send-email-takondra@cisco.com> X-Auto-Response-Suppress: DR, OOF, AutoReply X-Authenticated-User: takondra@cisco.com Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Add "newcx" format that supports extended attributes and has increased size of c_mtime and c_filesize fields. Added -x option to select "newcx" format. Default is "newc". Refer to Documentation/early-userspace/buffer-format.txt for detailed format description. Signed-off-by: Taras Kondratiuk --- usr/gen_init_cpio.c | 70 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 21 deletions(-) diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 7a2a6d85345d..78a47a5bdcb1 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -10,6 +10,7 @@ #include #include #include +#include /* * Original work by Jeff Garzik @@ -21,6 +22,8 @@ #define xstr(s) #s #define str(s) xstr(s) +static int newcx; +static unsigned int cpio_hdr_size; static unsigned int offset; static unsigned int ino = 721; static time_t default_mtime; @@ -56,7 +59,7 @@ static void push_rest(const char *name) putchar(0); offset += name_len; - tmp_ofs = name_len + 110; + tmp_ofs = name_len + cpio_hdr_size; while (tmp_ofs & 3) { putchar(0); offset++; @@ -77,6 +80,7 @@ struct cpio_header { int rdevmajor; int rdevminor; size_t namesize; + size_t xattrsize; unsigned int check; }; @@ -84,24 +88,44 @@ static void push_hdr(const struct cpio_header *hdr) { char s[256]; - sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", - hdr->ino, - hdr->mode, - (long)hdr->uid, - (long)hdr->gid, - hdr->nlink, - (long)hdr->mtime, - (unsigned int)hdr->filesize, - hdr->devmajor, - hdr->devminor, - hdr->rdevmajor, - hdr->rdevminor, - (unsigned int)hdr->namesize, - hdr->check); + if (newcx) { + sprintf(s, "%s%08X%08X%08lX%08lX%08X%016llX" + "%016llX%08X%08X%08X%08X%08X%08X", + "070703", + hdr->ino, + hdr->mode, + (long)hdr->uid, + (long)hdr->gid, + hdr->nlink, + hdr->mtime * 1000000ULL, + (long long)hdr->filesize, + hdr->devmajor, + hdr->devminor, + hdr->rdevmajor, + hdr->rdevminor, + (unsigned int)hdr->namesize, + (unsigned int)hdr->xattrsize); + } else { + sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" + "%08X%08X%08X%08X%08X%08X%08X", + "070701", + hdr->ino, + hdr->mode, + (long)hdr->uid, + (long)hdr->gid, + hdr->nlink, + (long)hdr->mtime, + (unsigned int)hdr->filesize, + hdr->devmajor, + hdr->devminor, + hdr->rdevmajor, + hdr->rdevminor, + (unsigned int)hdr->namesize, + hdr->check); + } fputs(s, stdout); - offset += 110; + assert((offset & 3) == 0); + offset += cpio_hdr_size; } static void cpio_trailer(void) @@ -301,7 +325,7 @@ static int cpio_mkfile(const char *name, const char *location, { char *filebuf = NULL; struct stat buf; - long size; + size_t size; int file = -1; int retval; int rc = -1; @@ -450,7 +474,7 @@ static int cpio_mkfile_line(const char *line) static void usage(const char *prog) { fprintf(stderr, "Usage:\n" - "\t%s [-t ] \n" + "\t%s [-t ] [-x] \n" "\n" " is a file containing newline separated entries that\n" "describe the files to be included in the initramfs archive:\n" @@ -527,7 +551,7 @@ int main (int argc, char *argv[]) default_mtime = time(NULL); while (1) { - int opt = getopt(argc, argv, "t:h"); + int opt = getopt(argc, argv, "t:h:x"); char *invalid; if (opt == -1) @@ -542,12 +566,16 @@ int main (int argc, char *argv[]) exit(1); } break; + case 'x': + newcx = 1; + break; case 'h': case '?': usage(argv[0]); exit(opt == 'h' ? 0 : 1); } } + cpio_hdr_size = newcx ? 134 : 110; if (argc - optind != 1) { usage(argv[0]);