From patchwork Fri Feb 16 20:33:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 10225653 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 A0D9160231 for ; Fri, 16 Feb 2018 20:37:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9119D28514 for ; Fri, 16 Feb 2018 20:37:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85AF928AD3; Fri, 16 Feb 2018 20:37:07 +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 E430728514 for ; Fri, 16 Feb 2018 20:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751088AbeBPUgv (ORCPT ); Fri, 16 Feb 2018 15:36:51 -0500 Received: from alln-iport-5.cisco.com ([173.37.142.92]:39133 "EHLO alln-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbeBPUeF (ORCPT ); Fri, 16 Feb 2018 15:34:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=6472; q=dns/txt; s=iport; t=1518813245; x=1520022845; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=VzDkcxzMGJ0IhODDQLEFZl6bqQ682naEKCD4uPEFu8A=; b=J76RaszVuxMDD751yurhcd4bmkwD3wytQ75E57cpoQc3DQs8HVorEMu0 XkK3jKQxt8kSCqPOYd/b74FxIo5rwReX7XS5PQgG8JW1I2yDfI/TreFBe tS6ECEdYyrhz+jvXKkuSPlRhqFUlLAK01K57SLr5LP6VNfcs3wdn879XJ s=; X-IronPort-AV: E=Sophos;i="5.46,520,1511827200"; d="scan'208";a="71365210" 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; 16 Feb 2018 20:34:04 +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 w1GKXsMZ015412 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NO); Fri, 16 Feb 2018 20:34:03 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 v3 10/15] gen_init_cpio: move header formatting into function Date: Fri, 16 Feb 2018 20:33:46 +0000 Message-Id: <1518813234-5874-11-git-send-email-takondra@cisco.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518813234-5874-1-git-send-email-takondra@cisco.com> References: <1518813234-5874-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 CPIO header is generated in multiple places with the same sprintf() format string. Move formatting into a single function in preparation to adding a new cpio format. Signed-off-by: Taras Kondratiuk --- usr/gen_init_cpio.c | 186 ++++++++++++++++++++++++++-------------------------- 1 file changed, 92 insertions(+), 94 deletions(-) diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 03b21189d58b..7a2a6d85345d 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -64,34 +64,55 @@ static void push_rest(const char *name) } } -static void push_hdr(const char *s) +struct cpio_header { + unsigned int ino; + unsigned int mode; + uid_t uid; + gid_t gid; + unsigned int nlink; + time_t mtime; + size_t filesize; + int devmajor; + int devminor; + int rdevmajor; + int rdevminor; + size_t namesize; + unsigned int check; +}; + +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); fputs(s, stdout); offset += 110; } static void cpio_trailer(void) { - char s[256]; const char name[] = "TRAILER!!!"; + struct cpio_header hdr = { + .nlink = 1, + .namesize = strlen(name)+1, + }; - sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - 0, /* ino */ - 0, /* mode */ - (long) 0, /* uid */ - (long) 0, /* gid */ - 1, /* nlink */ - (long) 0, /* mtime */ - 0, /* filesize */ - 0, /* major */ - 0, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name)+1, /* namesize */ - 0); /* chksum */ - push_hdr(s); + push_hdr(&hdr); push_rest(name); while (offset % 512) { @@ -103,27 +124,21 @@ static void cpio_trailer(void) static int cpio_mkslink(const char *name, const char *target, unsigned int mode, uid_t uid, gid_t gid) { - char s[256]; - if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - S_IFLNK | mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 1, /* nlink */ - (long) default_mtime, /* mtime */ - (unsigned)strlen(target)+1, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); + struct cpio_header hdr = { + .ino = ino++, + .mode = S_IFLNK | mode, + .uid = uid, + .gid = gid, + .nlink = 1, + .mtime = default_mtime, + .filesize = strlen(target)+1, + .devmajor = 3, + .devminor = 1, + .namesize = strlen(name)+1, + }; + push_hdr(&hdr); push_string(name); push_pad(); push_string(target); @@ -152,27 +167,20 @@ static int cpio_mkslink_line(const char *line) static int cpio_mkgeneric(const char *name, unsigned int mode, uid_t uid, gid_t gid) { - char s[256]; - if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 2, /* nlink */ - (long) default_mtime, /* mtime */ - 0, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); + struct cpio_header hdr = { + .ino = ino++, + .mode = mode, + .uid = uid, + .gid = gid, + .nlink = 2, + .mtime = default_mtime, + .devmajor = 3, + .devminor = 1, + .namesize = strlen(name)+1, + }; + push_hdr(&hdr); push_rest(name); return 0; } @@ -241,8 +249,6 @@ static int cpio_mknod(const char *name, unsigned int mode, uid_t uid, gid_t gid, char dev_type, unsigned int maj, unsigned int min) { - char s[256]; - if (dev_type == 'b') mode |= S_IFBLK; else @@ -250,23 +256,20 @@ static int cpio_mknod(const char *name, unsigned int mode, if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08X%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino++, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - 1, /* nlink */ - (long) default_mtime, /* mtime */ - 0, /* filesize */ - 3, /* major */ - 1, /* minor */ - maj, /* rmajor */ - min, /* rminor */ - (unsigned)strlen(name) + 1,/* namesize */ - 0); /* chksum */ - push_hdr(s); + struct cpio_header hdr = { + .ino = ino++, + .mode = mode, + .uid = uid, + .gid = gid, + .nlink = 1, + .mtime = default_mtime, + .devmajor = 3, + .devminor = 1, + .rdevmajor = maj, + .rdevminor = min, + .namesize = strlen(name)+1, + }; + push_hdr(&hdr); push_rest(name); return 0; } @@ -296,7 +299,6 @@ static int cpio_mkfile(const char *name, const char *location, unsigned int mode, uid_t uid, gid_t gid, unsigned int nlinks) { - char s[256]; char *filebuf = NULL; struct stat buf; long size; @@ -340,23 +342,19 @@ static int cpio_mkfile(const char *name, const char *location, if (name[0] == '/') name++; namesize = strlen(name) + 1; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" - "%08lX%08X%08X%08X%08X%08X%08X", - "070701", /* magic */ - ino, /* ino */ - mode, /* mode */ - (long) uid, /* uid */ - (long) gid, /* gid */ - nlinks, /* nlink */ - (long) buf.st_mtime, /* mtime */ - size, /* filesize */ - 3, /* major */ - 1, /* minor */ - 0, /* rmajor */ - 0, /* rminor */ - namesize, /* namesize */ - 0); /* chksum */ - push_hdr(s); + struct cpio_header hdr = { + .ino = ino, + .mode = mode, + .uid = uid, + .gid = gid, + .nlink = nlinks, + .mtime = buf.st_mtime, + .filesize = size, + .devmajor = 3, + .devminor = 1, + .namesize = namesize, + }; + push_hdr(&hdr); push_string(name); push_pad();