From patchwork Tue Jul 24 06:57:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 142697 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6918936ljj; Mon, 23 Jul 2018 23:58:45 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeAdtTwmey+V3TMi3j7FyZMifdBd/gGauCJN8n2e9+AX4rKlJwR0bMWlQKuoAP2ai62UfIO X-Received: by 2002:a62:930c:: with SMTP id b12-v6mr16354656pfe.193.1532415525799; Mon, 23 Jul 2018 23:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532415525; cv=none; d=google.com; s=arc-20160816; b=eGLPIOZj+4cCZsHG9Og4RJj8xRg1rVhSp4Z3raktOIf60fLdVtQOv4B5YvfkcQjsKQ e9uZVVm/OEIQxEzD1m/FQSItOrm4ofTcOpJQFW+Fo1tZJs+raFkL+QtrSX/bLW+GmLVZ 4Ni4YPCwc7wfhZnqihJA/SK1Fy2H418ngzGWgq3PtxpR85sQohJNQs3VjSUhutZyw6Vb +uPxrvNvkUSh/tcCoFR87PgX3AnSHOqi3qSDfHTXVfCfMCZR+DVF2oijLAGZj469MZxA huhyKpB/i5JB8MtKaeUvtmijzmxCehqOPpN7WfUQ5Z1NYfwXLbXk8Na1jTk/604oHe/9 re5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=5WKpaAKKCjtuCon1SB1pm/aYftkpZ2mbIZYdxG7foEs=; b=SD/3MWAAWISzSEi3x3GLSDp3IP0G7mL6f4vB7QKe0xp3llTcxYEoJkPCnzQDUAYBgc wlEgrgOkN9JIHr9CFhIZti8Oa77+PtYeSJQqaurT5nN+mP3OdK7uDt99Xenfcbq9bVsz gDnjjML64TVW6zgQtu9Yx275DsmvZgfeQuqLLaRaxoDT/T5xpfph0Wk0bjVOEc1ne4e5 EWUO4KJmSOz+5aoskz0vceqKkhXQmUoFH8uQuh7w0+nqHzEQFL0iPPzTc6U1CDAtcdW+ XQSgsylFTgIuvuUGSr2pJ35A59XzoGgGGHARv4v+qIv/N7msvznjcb8UN2RNYGXvMqi/ UvnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AarIjMD+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v17-v6si11183962pfl.233.2018.07.23.23.58.45; Mon, 23 Jul 2018 23:58:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AarIjMD+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388543AbeGXIDk (ORCPT + 31 others); Tue, 24 Jul 2018 04:03:40 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:46519 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388264AbeGXIDk (ORCPT ); Tue, 24 Jul 2018 04:03:40 -0400 Received: by mail-pl0-f65.google.com with SMTP id t17-v6so1324771ply.13 for ; Mon, 23 Jul 2018 23:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5WKpaAKKCjtuCon1SB1pm/aYftkpZ2mbIZYdxG7foEs=; b=AarIjMD+eO12HJwfMB/qHMlGWfVPWzcpkxlxb2HBpAVHrlxOUUXllc7QA7gWklBJtN cdRKIPzT6tYu7cmDWbO/UFfroONpilzEZSBKwURUO9bytSNtwmB9zblcQHbkSRdHh0CZ v707AQUEDS5vsdB2Y1RhxfCF37iaA1JNXCYlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5WKpaAKKCjtuCon1SB1pm/aYftkpZ2mbIZYdxG7foEs=; b=phvJAUpHCblEaOiL/Z/ihZNe48ac/swdhcQQK67rz6+bce00rFMZrxhY6yvs78tg+J uuDUxj9jdfYnuyrAuawIeDIqr++WIgrIhw7TLSS/Nd7jmVdA+bljX6KA1mU8Zgs5aQLQ 9ens1mk6TdNdD5Nsk5ThGOmj9LUUibYmFOwN/S0Ht/ylPhkCtoSi3MkjHHKPQ+rQIcVj yAZ4sfCPi8dJhnmGjyWrNLiXh13kvoU2sk/SxvPOOMKKhbToMye3rU2UjCiMgq2T/ayt t4QkjbMQapVv1Ou3VbkZYUzZJcHn3Mqata64EjZLqqfA75NiOGQV5CdVTYHSj0xwpnWC x/vw== X-Gm-Message-State: AOUpUlEUIlwueIs1Ye+u3nFOT2QBOYUV9sdZIKge7DY1auNFYuG1T43u vd0mnpBPC+zxE4cU6NElxUnpJA== X-Received: by 2002:a17:902:784d:: with SMTP id e13-v6mr15545045pln.197.1532415521548; Mon, 23 Jul 2018 23:58:41 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id s16-v6sm14600661pfm.114.2018.07.23.23.58.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 23:58:40 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v12 11/16] arm64: kexec_file: allow for loading Image-format kernel Date: Tue, 24 Jul 2018 15:57:54 +0900 Message-Id: <20180724065759.19186-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724065759.19186-1-takahiro.akashi@linaro.org> References: <20180724065759.19186-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch provides kexec_file_ops for "Image"-format kernel. In this implementation, a binary is always loaded with a fixed offset identified in text_offset field of its header. Regarding signature verification for trusted boot, this patch doesn't contains CONFIG_KEXEC_VERIFY_SIG support, which is to be added later in this series, but file-attribute-based verification is still a viable option by enabling IMA security subsystem. You can sign(label) a to-be-kexec'ed kernel image on target file system with: $ evmctl ima_sign --key /path/to/private_key.pem Image On live system, you must have IMA enforced with, at least, the following security policy: "appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig" See more details about IMA here: https://sourceforge.net/p/linux-ima/wiki/Home/ Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: James Morse --- arch/arm64/include/asm/kexec.h | 28 +++++++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/kexec_image.c | 108 +++++++++++++++++++++++++ arch/arm64/kernel/machine_kexec_file.c | 1 + 4 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/kexec_image.c -- 2.18.0 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 026f7e408f0c..5d102a1054b3 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -101,6 +101,34 @@ struct kimage_arch { unsigned long dtb_mem; }; +/** + * struct arm64_image_header - arm64 kernel image header + * See Documentation/arm64/booting.txt for details + * + * @mz_magic: DOS header magic number ('MZ', optional) + * @code1: Instruction (branch to stext) + * @text_offset: Image load offset + * @image_size: Effective image size + * @flags: Bit-field flags + * @reserved: Reserved + * @magic: Magic number + * @pe_header: Offset to PE COFF header (optional) + **/ + +struct arm64_image_header { + __le16 mz_magic; /* also code0 */ + __le16 pad; + __le32 code1; + __le64 text_offset; + __le64 image_size; + __le64 flags; + __le64 reserved[3]; + __le32 magic; + __le32 pe_header; +}; + +extern const struct kexec_file_ops kexec_image_ops; + struct kimage; extern int arch_kimage_file_post_load_cleanup(struct kimage *image); diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 06281e1ad7ed..a9cc7752f276 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -50,7 +50,7 @@ arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ cpu-reset.o -arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o +arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c new file mode 100644 index 000000000000..d64f5e9f9d22 --- /dev/null +++ b/arch/arm64/kernel/kexec_image.c @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Kexec image loader + + * Copyright (C) 2018 Linaro Limited + * Author: AKASHI Takahiro + */ + +#define pr_fmt(fmt) "kexec_file(Image): " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int image_probe(const char *kernel_buf, unsigned long kernel_len) +{ + const struct arm64_image_header *h; + + h = (const struct arm64_image_header *)(kernel_buf); + + if (!h || (kernel_len < sizeof(*h)) || + memcmp(&h->magic, ARM64_MAGIC, sizeof(h->magic))) + return -EINVAL; + + return 0; +} + +static void *image_load(struct kimage *image, + char *kernel, unsigned long kernel_len, + char *initrd, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len) +{ + struct arm64_image_header *h; + u64 flags, value; + struct kexec_buf kbuf; + unsigned long text_offset; + struct kexec_segment *kernel_segment; + int ret; + + /* Don't support old kernel */ + h = (struct arm64_image_header *)kernel; + if (!h->text_offset) + return ERR_PTR(-EINVAL); + + /* Check cpu features */ + flags = le64_to_cpu(h->flags); + value = head_flag_field(flags, HEAD_FLAG_BE); + if (((value == HEAD_FLAG_BE) && !IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) || + ((value != HEAD_FLAG_BE) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))) + if (!system_supports_mixed_endian()) + return ERR_PTR(-EINVAL); + + value = head_flag_field(flags, HEAD_FLAG_PAGE_SIZE); + if (((value == HEAD_FLAG_PAGE_SIZE_4K) && + !system_supports_4kb_granule()) || + ((value == HEAD_FLAG_PAGE_SIZE_64K) && + !system_supports_64kb_granule()) || + ((value == HEAD_FLAG_PAGE_SIZE_16K) && + !system_supports_16kb_granule())) + return ERR_PTR(-EINVAL); + + /* Load the kernel */ + kbuf.image = image; + kbuf.buf_min = 0; + kbuf.buf_max = ULONG_MAX; + kbuf.top_down = false; + + kbuf.buffer = kernel; + kbuf.bufsz = kernel_len; + kbuf.mem = 0; + kbuf.memsz = le64_to_cpu(h->image_size); + text_offset = le64_to_cpu(h->text_offset); + kbuf.buf_align = MIN_KIMG_ALIGN; + + /* Adjust kernel segment with TEXT_OFFSET */ + kbuf.memsz += text_offset; + + ret = kexec_add_buffer(&kbuf); + if (ret) + return ERR_PTR(ret); + + kernel_segment = &image->segment[image->nr_segments - 1]; + kernel_segment->mem += text_offset; + kernel_segment->memsz -= text_offset; + image->start = kernel_segment->mem; + + pr_debug("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + kernel_segment->mem, kbuf.bufsz, + kernel_segment->memsz); + + /* Load additional data */ + ret = load_other_segments(image, + kernel_segment->mem, kernel_segment->memsz, + initrd, initrd_len, cmdline, cmdline_len); + + return ERR_PTR(ret); +} + +const struct kexec_file_ops kexec_image_ops = { + .probe = image_probe, + .load = image_load, +}; diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index b28fbb0659c9..b8297f10e2ef 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -20,6 +20,7 @@ #include const struct kexec_file_ops * const kexec_file_loaders[] = { + &kexec_image_ops, NULL };