From patchwork Thu Jan 25 03:27:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 10183565 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 EB1BB60383 for ; Thu, 25 Jan 2018 03:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE4DA28A78 for ; Thu, 25 Jan 2018 03:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCA1428A6D; Thu, 25 Jan 2018 03:39:13 +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 518BC28A78 for ; Thu, 25 Jan 2018 03:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933697AbeAYDim (ORCPT ); Wed, 24 Jan 2018 22:38:42 -0500 Received: from alln-iport-1.cisco.com ([173.37.142.88]:37385 "EHLO alln-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933530AbeAYDhh (ORCPT ); Wed, 24 Jan 2018 22:37:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=3554; q=dns/txt; s=iport; t=1516851457; x=1518061057; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=SKSzgJ7JOr5F6Hhe3wP2BTpv621zuUSOPmDByr7KvIs=; b=Uy9YB+afMKtsL5GxaonvXuMA1KmO8w3URINIMU5HOhDLPMC7BFnCXUwr v7rQhTamOcyppjEtdWp9YoqNDTOlGvjf2aHxXQO/ajbDcJw5EreSVeLMP k9IZ8kA9fPwfSCQ1vpcXEgPCpVKZ/Xv4A5+stbosgalsX0FDKeUyJYJns o=; X-IronPort-AV: E=Sophos;i="5.46,409,1511827200"; d="scan'208";a="61310568" Received: from rcdn-core-6.cisco.com ([173.37.93.157]) by alln-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 03:28:05 +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 w0P3Ruj0007601 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NO); Thu, 25 Jan 2018 03:28:04 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 09/15] initramfs: set extended attributes Date: Thu, 25 Jan 2018 03:27:49 +0000 Message-Id: <1516850875-25066-10-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 From: Mimi Zohar This patch writes out the extended attributes included in the cpio file. As the "security.ima" xattr needs to be written after the file data. this patch separates extracting and setting the xattrs by defining new do_setxattrs state. [kamensky: fixed restoring of xattrs for symbolic links by using sys_lsetxattr() instead of sys_setxattr()] Signed-off-by: Mimi Zohar Signed-off-by: Victor Kamensky Signed-off-by: Taras Kondratiuk --- init/initramfs.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 3d0f46c28459..040e26cf451a 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -310,6 +310,7 @@ static int __init do_xattrs(void); static int __init do_create(void); static int __init do_copy(void); static int __init do_symlink(void); +static int __init do_setxattrs(void); static int __init do_reset(void); typedef int (*fsm_state_t)(void); @@ -472,7 +473,7 @@ static int __init do_name(void) static int __init do_xattrs(void) { - /* Do nothing for now */ + memcpy_optional(xattr_buf, collected, xattr_len); state = do_create; return 0; } @@ -481,8 +482,7 @@ static __initdata int wfd; static int __init do_create(void) { - state = do_skip; - next_state = do_reset; + state = do_setxattrs; clean_path(name_buf, mode); if (S_ISREG(mode)) { int ml = maybe_link(name_buf); @@ -515,8 +515,11 @@ static int __init do_create(void) do_utime(name_buf, mtime); } } else if (S_ISLNK(mode)) { - if (body_len > PATH_MAX) + if (body_len > PATH_MAX) { + state = do_skip; + next_state = do_reset; return 0; + } read_into(symlink_buf, body_len, do_symlink); } return 0; @@ -530,7 +533,7 @@ static int __init do_copy(void) sys_close(wfd); do_utime(name_buf, mtime); eat(body_len); - state = do_skip; + state = do_setxattrs; return 0; } else { if (xwrite(wfd, victim, byte_count) != byte_count) @@ -549,8 +552,52 @@ static int __init do_symlink(void) sys_symlink(symlink_buf, name_buf); sys_lchown(name_buf, uid, gid); do_utime(name_buf, mtime); + state = do_setxattrs; + return 0; +} + +struct xattr_hdr { + char c_size[8]; /* total size including c_size field */ + char c_data[]; /* \0 */ +}; + +static int __init do_setxattrs(void) +{ + char *buf = xattr_buf; + char *bufend = buf + xattr_len; + struct xattr_hdr *hdr; + char str[sizeof(hdr->c_size) + 1]; + state = do_skip; next_state = do_reset; + if (!xattr_len) + return 0; + + str[sizeof(hdr->c_size)] = 0; + + while (buf < bufend) { + char *xattr_name, *xattr_value; + unsigned long xattr_entry_size, xattr_value_size; + int ret; + + hdr = (struct xattr_hdr *)buf; + memcpy(str, hdr->c_size, sizeof(hdr->c_size)); + ret = kstrtoul(str, 16, &xattr_entry_size); + buf += xattr_entry_size; + if (ret || buf > bufend) { + error("malformed xattrs"); + break; + } + + xattr_name = hdr->c_data; + xattr_value = xattr_name + strlen(xattr_name) + 1; + xattr_value_size = buf - xattr_value; + + ret = sys_lsetxattr(name_buf, xattr_name, xattr_value, + xattr_value_size, 0); + pr_debug("%s: %s size: %lu val: %s (ret: %d)\n", name_buf, + xattr_name, xattr_value_size, xattr_value, ret); + } return 0; }