From patchwork Thu Feb 22 11:17:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 129213 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp482069lja; Thu, 22 Feb 2018 03:19:58 -0800 (PST) X-Google-Smtp-Source: AH8x2273UGrIoG2Youi21RzKwBS6vRdyfOPWPJ1kHVZzOHi1uk1TP5KZWiDAEwPqQqz2Rn6SqH/M X-Received: by 2002:a17:902:8d81:: with SMTP id v1-v6mr6207851plo.430.1519298398211; Thu, 22 Feb 2018 03:19:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519298398; cv=none; d=google.com; s=arc-20160816; b=teUahQYe0WW/iI6foIQBmj7TfD1q3VkGo5KZm8gUUZ9HPGdtwDR42wxcbm2pOTTnWP 3N6PcnsRgFylnWYXuBQubt73xUEkW4O5oppodyveVHAQ3OZjCiS+1ZPpYRIaT8ohuNaw tQu6W+Rl7IxG3MgfaiCRhpwk/KVEn1ojRbzHmFjgfYVhuXGyVz3h5x0P7zPG4rspJVcu e0Ap+A3DToeeIfsr/neC0/0yEC2ikiVtRJuUNB/WPS5AoigWuForofoyE0zzewf9jH5o jAGw+0zH/pn/1cqBgq1hr11cwml56h2Y3fEZap2TeKt5H4TXNrg2JuGiunhHL2K0lnL9 VgLQ== 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=4ojgkLUeMnzShFW7B1qBplIWMSH7iuYhyTsUehR83J0=; b=oGyVBEOm/7KjbRgJRZ+UxQNhPVWn3gaMY1IHY3nZZOl3GDoIY07xxDlTGvtJsRl8Wo aM49FD/wLwqOPmaJU/Cj+GcXZOVWpSc3pkAtJYcBMGDoDsR9/AeuU9b4x+2x+E6XbkX3 BY90JDORG12ThfxNUC3exbrV0WB2zQg+RYMWlo63LPZOuZFdtdm7c/24uteHmFiPiC/l fhKJWIVadfm7TDJFl6Va46jGzUNd1PHx+EtaU+D/WQ2KN54oni8QY0V3piVFh/BRkDdQ yqtb3FMe7/a/vyLU58BQuSg4YZRtdvlIt1x3SBXkoxrTfq4RRAJ/ICRo8rtWXTfIf7LT SRYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eQNfphRE; 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 k8si64866pgc.472.2018.02.22.03.19.57; Thu, 22 Feb 2018 03:19:58 -0800 (PST) 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=eQNfphRE; 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 S932218AbeBVLTz (ORCPT + 28 others); Thu, 22 Feb 2018 06:19:55 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:39038 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753643AbeBVLTt (ORCPT ); Thu, 22 Feb 2018 06:19:49 -0500 Received: by mail-io0-f193.google.com with SMTP id b34so5634234ioj.6 for ; Thu, 22 Feb 2018 03:19:49 -0800 (PST) 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=4ojgkLUeMnzShFW7B1qBplIWMSH7iuYhyTsUehR83J0=; b=eQNfphRER/oIY6fM7BDAAV42GjzwzRY11YHPjux4nibmf98asFtcosecoRXie+kpkp HTT/ic0lubBxIWSbJFJPxP1yKVTrdNDaCeYw60YhABzMKXrCSdqlv3wvR4Z6uL3hPEzD y7k+xuaFX6u+7eFbY6tclYF7sWVSvegecaug8= 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=4ojgkLUeMnzShFW7B1qBplIWMSH7iuYhyTsUehR83J0=; b=ZONZN8lj7jEWWHMGuXAGQuXA43g9auehLi+AT0RPjiXEZ1LqljOww2mQGXq0wmsz3Q DSqs+OUrVijworL6Z64IcuiR1cIWTsvgWJzTSnhs4Gcq6JhxhSVQEhF5DvgR1jCj7m86 qcFBZ5FhHmze0+MhbXQsMbmbVxbCAfJ2ZYbVW9yAm33D2GvLirR4PfGpEdj1AVj7vsY1 ZtA4+uoC10NDnDF4czjuwasrmjY2zyVfYPBBeEY9GNILq3z1aQ5jmJudk8XG0tha9IZR B/SuSJklqO3RoVGfXcKpTu511WWSsnCxcOKPBLPZgyBg6pDighagjw+gEPRGnGCs1w3y oekg== X-Gm-Message-State: APf1xPD8ild47OPJCP6s8Vf6aFOy5ISpuGOtBxhRfHLve00GbzhIlZzI ZB5B+b6gvcdZNTX6+h+NqEsmqg== X-Received: by 10.107.50.17 with SMTP id y17mr7797691ioy.223.1519298388639; Thu, 22 Feb 2018 03:19:48 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id l16sm6206503ioc.80.2018.02.22.03.19.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 03:19:47 -0800 (PST) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, bauerman@linux.vnet.ibm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, mpe@ellerman.id.au, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org, julien.thierry@arm.com Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v8 10/13] arm64: kexec_file: add Image format support Date: Thu, 22 Feb 2018 20:17:29 +0900 Message-Id: <20180222111732.23051-11-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180222111732.23051-1-takahiro.akashi@linaro.org> References: <20180222111732.23051-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. Please note that a binary is always loaded at an offset based on its text_offset field. While this patch doesn't contains CONFIG_KEXEC_VERIFY_SIG support, that is to be added in a later patch in this series, file-attribute-based kernel verification can now be materialised by enabling IMA security subsystem. See more details about IMA here: https://sourceforge.net/p/linux-ima/wiki/Home/ You can sign(label) a kernel image on target filesystem to be kexec-ed 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" Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/kexec.h | 50 +++++++++++++++++++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/kexec_image.c | 90 ++++++++++++++++++++++++++++++++++ arch/arm64/kernel/machine_kexec_file.c | 1 + 4 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/kexec_image.c -- 2.16.2 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index d7427d510e1b..592890085aae 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -105,6 +105,56 @@ struct kimage_arch { unsigned long elf_load_addr; }; +/** + * struct arm64_image_header - arm64 kernel image header + * + * @pe_sig: Optional PE format 'MZ' signature + * @branch_code: Instruction to branch to stext + * @text_offset: Image load offset, little endian + * @image_size: Effective image size, little endian + * @flags: + * Bit 0: Kernel endianness. 0=little endian, 1=big endian + * @reserved: Reserved + * @magic: Magic number, "ARM\x64" + * @pe_header: Optional offset to a PE format header + **/ + +struct arm64_image_header { + u8 pe_sig[2]; + u8 pad[2]; + u32 branch_code; + u64 text_offset; + u64 image_size; + u64 flags; + u64 reserved[3]; + u8 magic[4]; + u32 pe_header; +}; + +static const u8 arm64_image_magic[4] = {'A', 'R', 'M', 0x64U}; + +/** + * arm64_header_check_magic - Helper to check the arm64 image header. + * + * Returns non-zero if header is OK. + */ + +static inline int arm64_header_check_magic(const struct arm64_image_header *h) +{ + if (!h) + return 0; + + if (!h->text_offset) + return 0; + + return (h->magic[0] == arm64_image_magic[0] + && h->magic[1] == arm64_image_magic[1] + && h->magic[2] == arm64_image_magic[2] + && h->magic[3] == arm64_image_magic[3]); +} + +extern const struct kexec_file_ops kexec_image_ops; + struct kimage; #define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 151dc890737c..454b2735603a 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -49,7 +49,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..de62def63dd6 --- /dev/null +++ b/arch/arm64/kernel/kexec_image.c @@ -0,0 +1,90 @@ +/* + * Kexec image loader + + * Copyright (C) 2018 Linaro Limited + * Author: AKASHI Takahiro + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define pr_fmt(fmt) "kexec_file(Image): " fmt + +#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 ((kernel_len < sizeof(*h)) || !arm64_header_check_magic(h)) + 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 kexec_buf kbuf; + struct arm64_image_header *h = (struct arm64_image_header *)kernel; + unsigned long text_offset; + int ret; + + /* Create elf core header segment */ + ret = load_crashdump_segments(image); + if (ret) + goto out; + + /* Load the kernel */ + kbuf.image = image; + if (image->type == KEXEC_TYPE_CRASH) { + kbuf.buf_min = crashk_res.start; + kbuf.buf_max = crashk_res.end + 1; + } else { + kbuf.buf_min = 0; + kbuf.buf_max = ULONG_MAX; + } + kbuf.top_down = 0; + + kbuf.buffer = kernel; + kbuf.bufsz = kernel_len; + kbuf.memsz = le64_to_cpu(h->image_size); + text_offset = le64_to_cpu(h->text_offset); + kbuf.buf_align = SZ_2M; + + /* Adjust kernel segment with TEXT_OFFSET */ + kbuf.memsz += text_offset; + + ret = kexec_add_buffer(&kbuf); + if (ret) + goto out; + + image->segment[image->nr_segments - 1].mem += text_offset; + image->segment[image->nr_segments - 1].memsz -= text_offset; + image->start = kbuf.mem + text_offset; + + pr_debug("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + image->start, kbuf.bufsz, kbuf.memsz); + + /* Load additional data */ + ret = load_other_segments(image, image->start, + initrd, initrd_len, cmdline, cmdline_len); + +out: + 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 fc132047c8cd..384146583f8d 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -25,6 +25,7 @@ static int __dt_root_addr_cells; static int __dt_root_size_cells; const struct kexec_file_ops * const kexec_file_loaders[] = { + &kexec_image_ops, NULL };